Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'MDL-60733-32' of git://github.com/damyon/moodle into MO…
- Loading branch information
Showing
with
18 additions
and
2 deletions.
-
+13
−0
lib/googleapi.php
-
+5
−2
lib/oauthlib.php
|
@@ -448,4 +448,17 @@ public function reset_state() { |
|
|
$this->header = array(); |
|
|
$this->response = array(); |
|
|
} |
|
|
|
|
|
/** |
|
|
* Make a HTTP request, we override the parents because we do not |
|
|
* want to send accept headers (this was a change in the parent class and we want to keep the old behaviour). |
|
|
* |
|
|
* @param string $url The URL to request |
|
|
* @param array $options |
|
|
* @param mixed $acceptheader Not used. |
|
|
* @return bool |
|
|
*/ |
|
|
protected function request($url, $options = array(), $acceptheader = 'application/json') { |
|
|
return parent::request($url, $options, false); |
|
|
} |
|
|
} |
|
@@ -546,9 +546,10 @@ public function log_out() { |
|
|
* |
|
|
* @param string $url The URL to request |
|
|
* @param array $options |
|
|
* @param mixed $acceptheader mimetype (as string) or false to skip sending an accept header. |
|
|
* @return bool |
|
|
*/ |
|
|
protected function request($url, $options = array()) { |
|
|
protected function request($url, $options = array(), $acceptheader = 'application/json') { |
|
|
$murl = new moodle_url($url); |
|
|
|
|
|
if ($this->accesstoken) { |
|
@@ -561,7 +562,9 @@ protected function request($url, $options = array()) { |
|
|
} |
|
|
|
|
|
// Force JSON format content in response. |
|
|
$this->setHeader('Accept: application/json'); |
|
|
if ($acceptheader) { |
|
|
$this->setHeader('Accept: ' . $acceptheader); |
|
|
} |
|
|
|
|
|
return parent::request($murl->out(false), $options); |
|
|
} |
|
|