diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/colors.php | 23 | ||||
| -rw-r--r-- | include/functions.php | 4 |
2 files changed, 17 insertions, 10 deletions
diff --git a/include/colors.php b/include/colors.php index 91eaa2dc2..491d38c15 100644 --- a/include/colors.php +++ b/include/colors.php @@ -288,17 +288,24 @@ function hsl2rgb($arr) { $size = @getimagesize($imageFile); - if (strtolower($size['mime']) == 'image/vnd.microsoft.icon' && class_exists("floIcon")) { + // to enable .ico support place floIcon.php into lib/ + if (strtolower($size['mime']) == 'image/vnd.microsoft.icon') { - $ico = new floIcon(); - @$ico->readICO($imageFile); + if (class_exists("floIcon")) { - if(count($ico->images)==0) - return null; - else - $img = @$ico->images[count($ico->images)-1]->getImageResource(); + $ico = new floIcon(); + @$ico->readICO($imageFile); - } else { + if(count($ico->images)==0) + return false; + else + $img = @$ico->images[count($ico->images)-1]->getImageResource(); + + } else { + return false; + } + + } else if ($size[0] > 0 && $size[1] > 0) { $img = @imagecreatefromstring(file_get_contents($imageFile)); } diff --git a/include/functions.php b/include/functions.php index f05b5cb40..8be5ac6ae 100644 --- a/include/functions.php +++ b/include/functions.php @@ -71,6 +71,7 @@ "hu_HU" => "Magyar (Hungarian)", "it_IT" => "Italiano", "ja_JP" => "日本語 (Japanese)", + "ko_KR" => "한국어 (Korean)", "lv_LV" => "Latviešu", "nb_NO" => "Norwegian bokmål", "nl_NL" => "Dutch", @@ -1966,7 +1967,6 @@ $params["max_feed_id"] = (int) $max_feed_id; $params["num_feeds"] = (int) $num_feeds; - $params["collapsed_feedlist"] = (int) get_pref("_COLLAPSED_FEEDLIST"); $params["hotkeys"] = get_hotkeys_map(); $params["csrf_token"] = $_SESSION["csrf_token"]; @@ -3037,7 +3037,7 @@ if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false || $_SESSION["hasMp3"])) { - $entry .= "<audio controls> + $entry .= "<audio preload=\"none\" controls> <source type=\"$ctype\" src=\"$url\"></source> </audio>"; |