Skip to content

Prevented PHP error #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanhartless merged 2 commits into from
Apr 1, 2015
Merged

Prevented PHP error #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2931be
Prevented PHP error: CURLOPT_FOLLOWLOCATION cannot be activated when …
escopecz Mar 12, 2015
2e2c1cc
Correction of previous commit about CURLOPT_FOLLOWLOCATION
escopecz Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/Mautic/Auth/OAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,10 +623,16 @@ public function makeRequest ($url, array $parameters = array(), $method = 'GET',
CURLOPT_URL => $url,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_SSL_VERIFYPEER => false,
CURLOPT_HEADER => true,
CURLOPT_FOLLOWLOCATION => true
CURLOPT_HEADER => true
);

// CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set
if (ini_get('open_basedir')) {
$options[CURLOPT_FOLLOWLOCATION] = false;
} else {
$options[CURLOPT_FOLLOWLOCATION] = true;
}

//Set CURL headers for oauth 1.0 requests
if ($this->isOauth1()) {
$options[CURLOPT_HTTPHEADER] = $header;
Expand Down