Merge pull request #110 from philsturgeon/php55

Dont convert CURLFile: Take 2
facebookarchive · Nov 1, 2013 · 41e6c4f · 41e6c4f
2 parents 07deeed + d236be6
commit 41e6c4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,5 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 script: phpunit --stderr --bootstrap tests/bootstrap.php tests/tests.php
diff --git a/src/base_facebook.php b/src/base_facebook.php
@@ -901,7 +901,7 @@ protected function _oauthRequest($url, $params) {
 
     // json_encode all params values that are not strings
     foreach ($params as $key => $value) {
-      if (!is_string($value)) {
+      if (!is_string($value) && !($value instanceof CURLFile)) {
         $params[$key] = json_encode($value);
       }
     }