prefs: disable option ENABLE_FEED_ICONS

This commit is contained in:
Andrew Dolgov 2010-11-04 18:11:15 +03:00
parent f0361de20b
commit 85a922895f
4 changed files with 10 additions and 24 deletions

View File

@ -701,14 +701,12 @@
$site_url = $rss->channel["link"]; $site_url = $rss->channel["link"];
} }
if (get_pref($link, 'ENABLE_FEED_ICONS', $owner_uid, false)) { if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) { _debug("update_rss_feed: checking favicon...");
_debug("update_rss_feed: checking favicon...");
}
check_feed_favicon($site_url, $feed, $link);
} }
check_feed_favicon($site_url, $feed, $link);
if (!$registered_title || $registered_title == "[Unknown]") { if (!$registered_title || $registered_title == "[Unknown]") {
if ($use_simplepie) { if ($use_simplepie) {
@ -1681,10 +1679,7 @@
print $color_str; */ print $color_str; */
print "<li id=\"FEEDR-$feed_id\" class=\"$class\">"; print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
if (get_pref($link, 'ENABLE_FEED_ICONS')) { print "$feed_icon";
print "$feed_icon";
}
print "<span $rtl_tag id=\"FEEDN-$feed_id\">$feed</span>"; print "<span $rtl_tag id=\"FEEDN-$feed_id\">$feed</span>";
if ($unread != 0) { if ($unread != 0) {

View File

@ -296,10 +296,7 @@
$feed = "<a href=\"?go=vf&id=$feed_id\">$feed_title</a>"; $feed = "<a href=\"?go=vf&id=$feed_id\">$feed_title</a>";
print "<li class=\"$class\">"; print "<li class=\"$class\">";
if (get_pref($link, 'ENABLE_FEED_ICONS')) { print "$feed_icon";
print "$feed_icon";
}
print "<span $rtl_tag>$feed</span> "; print "<span $rtl_tag>$feed</span> ";
if ($unread != 0) { if ($unread != 0) {

View File

@ -1295,9 +1295,7 @@
print "<tr class=\"title\"> print "<tr class=\"title\">
<td width='5%' align='center'>&nbsp;</td>"; <td width='5%' align='center'>&nbsp;</td>";
if (get_pref($link, 'ENABLE_FEED_ICONS')) { print "<td width='3%'>&nbsp;</td>";
print "<td width='3%'>&nbsp;</td>";
}
print "<td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>"; print "<td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>";
@ -1354,9 +1352,7 @@
print "<tr class=\"title\"> print "<tr class=\"title\">
<td width='5%'>&nbsp;</td>"; <td width='5%'>&nbsp;</td>";
if (get_pref($link, 'ENABLE_FEED_ICONS')) { print "<td width='3%'>&nbsp;</td>";
print "<td width='3%'>&nbsp;</td>";
}
print "<td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>"; print "<td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>";
@ -1389,9 +1385,7 @@
$onclick = "onclick='editFeed($feed_id)' title='".__('Click to edit')."'"; $onclick = "onclick='editFeed($feed_id)' title='".__('Click to edit')."'";
if (get_pref($link, 'ENABLE_FEED_ICONS')) { print "<td $onclick class='feedIcon'>$feed_icon</td>";
print "<td $onclick class='feedIcon'>$feed_icon</td>";
}
if ($last_error) { if ($last_error) {
$edit_title = "<span class=\"feed_error\">$edit_title</span>"; $edit_title = "<span class=\"feed_error\">$edit_title</span>";

View File

@ -14,7 +14,7 @@
$subop = $_REQUEST["subop"]; $subop = $_REQUEST["subop"];
$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS", $prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
"ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS"); "ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS");
$profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",