Merge branch 'support/2.7' into develop

mynetx · mynetx · commit 470b3721ab73 · 2015-08-16T20:42:30.000+02:00
# Conflicts:
#	CHANGELOG
#	bower.json
#	src/codebird.php
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,9 @@ codebird-php - changelog
 + #121 Allow for multiple parameters in templated methods
   by replacing preg_match with preg_match_all
 
+2.7.1 (2015-08-16)
++ #124 Download redirected remote images
+
 2.7.0 (2015-05-14)
 - #92, #108 Fix issues with uploading special chars
 + #109 Proxy support
diff --git a/src/codebird.php b/src/codebird.php
@@ -733,7 +733,7 @@ protected function getCurlInitialization($url)
     protected function getNoCurlInitialization($url, $contextOptions, $hostname = '')
     {
         $httpOptions = [];
-        
+
         $httpOptions['header'] = [
             'User-Agent: codebird-php/' . $this->getVersion() . ' +https://github.com/jublonet/codebird-php'
         ];
@@ -1290,6 +1290,8 @@ protected function _getMultipartRequestFromParams($possible_files, $border, $par
                         // use hardcoded download timeouts for now
                         curl_setopt($ch, CURLOPT_TIMEOUT_MS, 5000);
                         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, 2000);
+                        // find files that have been redirected
+                        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
                         $result = curl_exec($ch);
                         if ($result !== false) {
                             $value = $result;
