Merge pull request #44 from schneidermichal/master

Json decode only responses with json content type
GitLabPHP · Jun 13, 2014 · 3f0e7df · 3f0e7df
2 parents 76ab3d5 + d44de17
commit 3f0e7df
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/Gitlab/HttpClient/Message/Response.php b/lib/Gitlab/HttpClient/Message/Response.php
@@ -12,12 +12,16 @@ class Response extends BaseResponse
     public function getContent()
     {
         $response = parent::getContent();
-        $content  = json_decode($response, true);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if ($this->getHeader("Content-Type") === "application/json") {
+            $content  = json_decode($response, true);
+
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                return $response;
+            }
+
+            return $content;
+        } else {
             return $response;
         }
-
-        return $content;
     }
 }