Merge pull request #648 from niol/ppr/fix-queue

Various fixes for opened issues

Author: SSilence

_docs/website/index.html

@@ -94,7 +94,7 @@ <h2>Requirements</h2>
             <div class="documentation-entry">
                 <p>selfoss is not a hosted service. It has to be installed on your own webserver. This webserver must fulfill the following requirements (which are available from most providers)</p>
                 <ul>
-                    <li>PHP 5.3 or higher</li>
+                    <li>PHP 5.3 or higher with the php-gd extension enabled</li>
                     <li>MySQL, PostgreSQL or Sqlite</li>
                     <li>Apache Webserver (ngnix and lighttpd also possible)</li>
                 </ul>

libs/SimplePie.php

@@ -6844,6 +6844,7 @@ public function __construct($url, $timeout = 10, $redirects = 5, $headers = null
 				curl_setopt($fp, CURLOPT_URL, $url);
 				curl_setopt($fp, CURLOPT_HEADER, 1);
 				curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($fp, CURLOPT_FAILONERROR, 1);
 				curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
 				curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
 				curl_setopt($fp, CURLOPT_REFERER, $url);

libs/WideImage/vendor/de77/BMP.php

@@ -131,7 +131,7 @@ public static function imagecreatefromstring($data)
 
 		$bps = $header['bits_per_pixel']; //bits per pixel 
 	    $wid2 = ceil(($bps/8 * $header['width']) / 4) * 4;
-		$colors = pow(2, $bps);
+		$colors = $header['colors'];
 
 	    $wid = $header['width'];
 	    $hei = $header['height'];