prefs: disable option ENABLE_FEED_ICONS

diff --git a/functions.php b/functions.php
index 174a19e8d3ca5aa97a3e4fe86dedc2163d1f777a..259aaf556b4be82ba18eea6173b369489e89c289 100644 (file)
--- 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 c7acba79e12fed904e27d7f1921e04e507fde336..bd61bbfd257a0c2a22bd24bc6ef9200b5c35359c 100644 (file)
--- 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 dc3553d109f3f94c55f71659972bf5ac8db341bd..b106797761920292d59f8cedbfe28ad364b7b213 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1295,9 +1295,7 @@
                                print "<tr class=\"title\">
                                        <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>";
 
@@ -1354,9 +1352,7 @@
                                        print "<tr class=\"title\">
                                                <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>";
 
@@ -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 a55d78f9f5bf043269bedeadef38503e97755437..5105f3573d4162e18d6557ab7b817f2d63288d0d 100644 (file)
--- 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",