Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle

moodle · Aug 1, 2017 · 5283fa3 · 5283fa3
2 parents 13822dc + 675b291
commit 5283fa3
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/oauthlib.php b/lib/oauthlib.php
@@ -557,6 +557,10 @@ public function upgrade_token($code) {
 
         $r = json_decode($response);
 
+        if (is_null($r)) {
+            throw new moodle_exception("Could not decode JSON token response");
+        }
+
         if (!empty($r->error)) {
             throw new moodle_exception($r->error . ' ' . $r->error_description);
         }
@@ -610,6 +614,9 @@ protected function request($url, $options = array()) {
             }
         }
 
+        // Force JSON format content in response.
+        $this->setHeader('Accept: application/json');
+
         $response = parent::request($murl->out(false), $options);
 
         $this->resetHeader();