From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 19 Feb 2014 11:43:08 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.12~42
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f97b56a3c9189da54763c4c03cb9c634ad6112b7;hp=-c;p=tt-rss.git

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

f97b56a3c9189da54763c4c03cb9c634ad6112b7
diff --combined include/functions.php
index 48f6218e,1d613a73..75722515
--- a/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;