From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Nov 2010 13:13:22 +0000 (+0300)
Subject: blacklist option EXTENDED_FEEDLIST
X-Git-Tag: 1.5.0~197
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=296c8134c1322ba51080732e7e9366b4cef47013;p=tt-rss.git

blacklist option EXTENDED_FEEDLIST
---

diff --git a/functions.php b/functions.php
index 756cf223..5fe77597 100644
--- a/functions.php
+++ b/functions.php
@@ -2740,8 +2740,8 @@
 			$cv = array("id" => $i,
 				"counter" => $count);
 	
-			if (get_pref($link, 'EXTENDED_FEEDLIST'))
-				$cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
+//			if (get_pref($link, 'EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
 
 			array_push($ret_arr, $cv);
 		} 
@@ -2773,8 +2773,8 @@
 			if ($descriptions)
 				$cv["description"] = $label_name;
 
-			if (get_pref($link, 'EXTENDED_FEEDLIST'))
-				$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+//			if (get_pref($link, 'EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
 
 			array_push($ret_arr, $cv);
 		}
@@ -2820,8 +2820,8 @@
 			if ($last_error)
 				$cv["error"] = $last_error;
 
-			if (get_pref($link, 'EXTENDED_FEEDLIST'))
-				$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
+//			if (get_pref($link, 'EXTENDED_FEEDLIST'))
+//				$cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
 
 			if ($active_feed && $id == $active_feed)
 				$cv["title"] = truncate_string($line["title"], 30);
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 00422793..2133715a 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -15,7 +15,7 @@
 
 		$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
 			"ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS", 
-			"ENABLE_OFFLINE_READING");
+			"ENABLE_OFFLINE_READING", "EXTENDED_FEEDLIST");
 
 		$profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", 
 			"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",