Merge remote-tracking branch 'upstream/master' into changes

Author: crondog

controllers/Rss.php

@@ -35,6 +35,9 @@ public function rss() {
         $options['items'] = \F3::get('rss_max_items');
         if(\F3::get('PARAMS["tag"]')!=null)
             $options['tag'] = \F3::get('PARAMS["tag"]');
+        if(\F3::get('PARAMS["type"]')!=null)
+            $options['type'] = \F3::get('PARAMS["type"]');
+            
 
         // get items
         $newestEntryDate = false;

helpers/Image.php

@@ -47,7 +47,7 @@ public function fetchFavicon($url, $isHtmlUrl=false, $width=false, $height=false
                 elseif (substr($shortcutIcon, 0, 1)=='/')
                     $shortcutIcon = $urlElements['scheme'] . '://' . $urlElements['host'] . $shortcutIcon;
                 else
-                    $shortcutIcon = $url . $shortcutIcon;
+                    $shortcutIcon = (strrpos($url, '/')===strlen($url)-1) ? $url . $shortcutIcon : $url . '/' . $shortcutIcon;
             }
 
             $faviconAsPng = $this->loadImage($shortcutIcon, $width, $height);
@@ -159,6 +159,8 @@ private function parseShortcutIcon($html) {
         $result = preg_match('/<link .*rel=("|\')apple-touch-icon\1.*>/Ui', $html, $match1);
         if($result==0)
             $result = preg_match('/<link [^>]*rel=("|\')shortcut icon\1.*>/Ui', $html, $match1);
+        if($result==0)
+            $result = preg_match('/<link [^>]*rel=("|\')icon\1.*>/Ui', $html, $match1);
         if($result>0) {
             preg_match('/href=("|\')(.*)\1/Ui', $match1[0], $match2);
             return $match2[2];