Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --combined include/functions.php
index 48f6218e1e92f9d781f960eefd90036e9ba13b4f,1d613a737eb13bd210282014a8b7e39e5da8cdb9..75722515dd6d9b5fb57a2fbdd67b78f35030d8fa
--- 1/include/functions.php
--- 2/include/functions.php
+++ b/include/functions.php
@@@ -79,6 -79,7 +79,7 @@@
                                        "ru_RU" => "Русский",
                                        "pt_BR" => "Portuguese/Brazil",
                                        "zh_CN" => "Simplified Chinese",
+                                       "zh_TW" => "Traditional Chinese",
                                        "sv_SE" => "Svenska",
                                        "fi_FI" => "Suomi",
                                        "tr_TR" => "Türkçe");
@@@ -1613,6 -1614,7 +1614,6 @@@
                                AND ttrss_counters_cache.feed_id = id";
  
                $result = db_query($query);
 -              $fctrs_modified = false;
  
                while ($line = db_fetch_assoc($result)) {
  
@@@ -2921,6 -2923,7 +2922,6 @@@
  
                                        $fragment = $doc->createDocumentFragment();
                                        $text = $child->textContent;
 -                                      $stubs = array();
  
                                        while (($pos = mb_stripos($text, $word)) !== false) {
                                                $fragment->appendChild(new DomText(mb_substr($text, 0, $pos)));
@@@ -3102,16 -3105,19 +3103,16 @@@
        }
  
        function format_warning($msg, $id = "") {
 -              global $link;
                return "<div class=\"warning\" id=\"$id\">
                        <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
        }
  
        function format_notice($msg, $id = "") {
 -              global $link;
                return "<div class=\"notice\" id=\"$id\">
                        <span><img src=\"images/information.png\"></span><span>$msg</span></div>";
        }
  
        function format_error($msg, $id = "") {
 -              global $link;
                return "<div class=\"error\" id=\"$id\">
                        <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
        }
@@@ -3220,6 -3226,8 +3221,6 @@@
  
                        $line = db_fetch_assoc($result);
  
 -                      $tag_cache = $line["tag_cache"];
 -
                        $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]);
                        unset($line["tag_cache"]);
  
@@@ -3375,7 -3383,7 +3376,7 @@@
                                        $rv['content'] .= "&nbsp;";
  
                                        $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
 -                                      $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.svg'></a>";
 +                                      $rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
  
                                        $rv['content'] .= "</div>";
                                }
@@@ -4261,9 -4269,9 +4262,9 @@@
                        $fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
                        curl_close($curl);
  
 -                      $oline='';
 -                      foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
 -                      $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
 +#                     $oline='';
 +#                     foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
 +#                     $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
  #                     $handle = @fopen('./curl.error.log', 'a');
  #                     fwrite($handle, $line);
                        return FALSE;