Skip to content

Commit 41e6c4f

Browse files
committed
Merge pull request facebookarchive#110 from philsturgeon/php55
Dont convert CURLFile: Take 2
2 parents 07deeed + d236be6 commit 41e6c4f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ language: php
22
php:
33
- 5.3
44
- 5.4
5+
- 5.5
56
script: phpunit --stderr --bootstrap tests/bootstrap.php tests/tests.php

src/base_facebook.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ protected function _oauthRequest($url, $params) {
901901

902902
// json_encode all params values that are not strings
903903
foreach ($params as $key => $value) {
904-
if (!is_string($value)) {
904+
if (!is_string($value) && !($value instanceof CURLFile)) {
905905
$params[$key] = json_encode($value);
906906
}
907907
}

0 commit comments

Comments
 (0)