diff options
| author | Andrew Dolgov <[email protected]> | 2010-11-04 18:11:15 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-11-04 18:11:15 +0300 |
| commit | 85a922895f2865a658f98a7d0e795aec05da3d06 (patch) | |
| tree | ac3716de251a9fde98aabdc0bb2be28e1a7da8b2 | |
| parent | f0361de20b2ec5602b3ebe440aa4b26046eb8193 (diff) | |
prefs: disable option ENABLE_FEED_ICONS
| -rw-r--r-- | functions.php | 15 | ||||
| -rw-r--r-- | mobile/classic/functions.php | 5 | ||||
| -rw-r--r-- | modules/pref-feeds.php | 12 | ||||
| -rw-r--r-- | modules/pref-prefs.php | 2 |
4 files changed, 10 insertions, 24 deletions
diff --git a/functions.php b/functions.php index 174a19e8d..259aaf556 100644 --- a/functions.php +++ b/functions.php @@ -701,14 +701,12 @@ $site_url = $rss->channel["link"]; } - if (get_pref($link, 'ENABLE_FEED_ICONS', $owner_uid, false)) { - if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) { - _debug("update_rss_feed: checking favicon..."); - } - - check_feed_favicon($site_url, $feed, $link); + if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) { + _debug("update_rss_feed: checking favicon..."); } + check_feed_favicon($site_url, $feed, $link); + if (!$registered_title || $registered_title == "[Unknown]") { if ($use_simplepie) { @@ -1681,10 +1679,7 @@ print $color_str; */ 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>"; if ($unread != 0) { diff --git a/mobile/classic/functions.php b/mobile/classic/functions.php index c7acba79e..bd61bbfd2 100644 --- a/mobile/classic/functions.php +++ b/mobile/classic/functions.php @@ -296,10 +296,7 @@ $feed = "<a href=\"?go=vf&id=$feed_id\">$feed_title</a>"; print "<li class=\"$class\">"; - if (get_pref($link, 'ENABLE_FEED_ICONS')) { - print "$feed_icon"; - } - + print "$feed_icon"; print "<span $rtl_tag>$feed</span> "; if ($unread != 0) { diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index dc3553d10..b10679776 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -1295,9 +1295,7 @@ print "<tr class=\"title\"> <td width='5%' align='center'> </td>"; - if (get_pref($link, 'ENABLE_FEED_ICONS')) { - print "<td width='3%'> </td>"; - } + print "<td width='3%'> </td>"; print "<td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>"; @@ -1354,9 +1352,7 @@ print "<tr class=\"title\"> <td width='5%'> </td>"; - if (get_pref($link, 'ENABLE_FEED_ICONS')) { - print "<td width='3%'> </td>"; - } + print "<td width='3%'> </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')."'"; - 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) { $edit_title = "<span class=\"feed_error\">$edit_title</span>"; diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index a55d78f9f..5105f3573 100644 --- a/modules/pref-prefs.php +++ b/modules/pref-prefs.php @@ -14,7 +14,7 @@ $subop = $_REQUEST["subop"]; $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", "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", |