Skip to content

Commit 182c10f

Browse files
committed
Merge branch 'develop' into release/3.0.0
# Conflicts: # CHANGELOG # src/codebird.php
2 parents 4ff9586 + 87043b1 commit 182c10f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ codebird-php - changelog
1717
+ Fixes for non-multipart media uploads, see #141
1818
+ Return rate-limiting info as object, when return format = object
1919
+ Add unit testing suite
20+
- #147 Undefined index when checking for possible media files
2021

2122
2.7.2 (2015-09-23)
2223
- #135 Invalid HTTP request headers in non-cURL mode

src/codebird.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@ protected function _getMultipartRequestFromParams($method_template, $border, $pa
17011701
* @return mixed
17021702
*/
17031703
protected function _checkForFiles($method_template, $key, $value) {
1704-
if (!isset(self::$_possible_files[$method_template])
1704+
if (!array_key_exists($method_template, self::$_possible_files)
17051705
|| !in_array($key, self::$_possible_files[$method_template])
17061706
) {
17071707
return false;

0 commit comments

Comments
 (0)