From 24c5e8598767365558d1517f8e45ebd54e794127 Mon Sep 17 00:00:00 2001 From: e107steved Date: Thu, 6 Dec 2007 20:23:13 +0000 Subject: [PATCH] Bugtracker #4239 - obsolete pref for RSS feeds deleted --- e107_files/def_e107_prefs.php | 7 +++---- e107_plugins/rss_menu/e_meta.php | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/e107_files/def_e107_prefs.php b/e107_files/def_e107_prefs.php index 9c23323db..18643947e 100644 --- a/e107_files/def_e107_prefs.php +++ b/e107_files/def_e107_prefs.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-07-18 20:20:20 $ +| $Revision: 1.4 $ +| $Date: 2007-12-06 20:23:07 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -154,13 +154,12 @@ City, State, Country 'comments_icon' => '0', 'nested_comments' => '1', 'allowCommentEdit' => '0', - 'rss_feeds' => '1', 'admincss' => 'style.css', 'developer' => '0', 'download_email' => '0', 'comments_disabled' => '0', 'memberlist_access' => '253', - 'check_updates' => '0' + 'check_updates' => '1' ); ?> \ No newline at end of file diff --git a/e107_plugins/rss_menu/e_meta.php b/e107_plugins/rss_menu/e_meta.php index f8f27bf19..15983a766 100644 --- a/e107_plugins/rss_menu/e_meta.php +++ b/e107_plugins/rss_menu/e_meta.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/e_meta.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-02-11 20:09:19 $ +| $Revision: 1.4 $ +| $Date: 2007-12-06 20:23:13 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -20,9 +20,8 @@ if (!defined('e107_INIT')) { exit; } global $tp,$PLUGINS_DIRECTORY; -if(isset($pref['rss_feeds']) && $pref['rss_feeds']) -{ - if($sql->db_Select("rss", "*", "rss_class='0' AND rss_limit>0 ORDER BY rss_name")){ + if($sql->db_Select("rss", "*", "rss_class='0' AND rss_limit>0 ORDER BY rss_name")) + { while($row=$sql->db_Fetch()){ //wildcard topic_id's should not be listed if(strpos($row['rss_url'], "*")===FALSE){ @@ -33,5 +32,5 @@ if(isset($pref['rss_feeds']) && $pref['rss_feeds']) } } } -} + ?> \ No newline at end of file