diff --git a/e107_plugins/chatbox_menu/e_rss.php b/e107_plugins/chatbox_menu/e_rss.php index 933dd6aca..4ccc7b239 100644 --- a/e107_plugins/chatbox_menu/e_rss.php +++ b/e107_plugins/chatbox_menu/e_rss.php @@ -17,7 +17,7 @@ class chatbox_menu_rss // plugin-folder + '_rss' /** * Admin RSS Configuration */ - function config() // XXX TODO // Have admin read this. + function config() { $config = array(); @@ -25,11 +25,10 @@ class chatbox_menu_rss // plugin-folder + '_rss' 'name' => 'Chatbox Posts', 'url' => 'chatbox', 'topic_id' => '', - 'path' => 'chatbox_menu', // known 'description' => 'this is the rss feed for the chatbox entries', // that's 'description' not 'text' 'class' => '0', 'limit' => '9' - ); + ); return $config; } diff --git a/e107_plugins/rss_menu/admin_prefs.php b/e107_plugins/rss_menu/admin_prefs.php index fc8489f76..1d9cac8c8 100644 --- a/e107_plugins/rss_menu/admin_prefs.php +++ b/e107_plugins/rss_menu/admin_prefs.php @@ -651,6 +651,7 @@ class rss foreach($data as $v) { + $v['path'] = $val; array_push($plugin_feedlist,$v); } @@ -659,7 +660,7 @@ class rss $feedlist = array_merge($feedlist, $plugin_feedlist); - // print_a($feedlist); +// print_a($feedlist); $render=FALSE; $i=0; diff --git a/e107_plugins/rss_menu/rss_shortcodes.php b/e107_plugins/rss_menu/rss_shortcodes.php index ef08c7e45..bf03a4436 100644 --- a/e107_plugins/rss_menu/rss_shortcodes.php +++ b/e107_plugins/rss_menu/rss_shortcodes.php @@ -164,6 +164,11 @@ SC_END SC_BEGIN RSS_ADMIN_IMPORT_CHECK global $feed, $rs, $tp, $i; +if($feed['description']) +{ + $feed['text'] = $feed['description']; +} + $text = ""; $text .= ""; $text .= ""; diff --git a/e107_plugins/rss_menu/rss_template.php b/e107_plugins/rss_menu/rss_template.php index 209d403ff..5358247af 100644 --- a/e107_plugins/rss_menu/rss_template.php +++ b/e107_plugins/rss_menu/rss_template.php @@ -5,9 +5,9 @@ if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:100%"); } // Rss listing if(!isset($RSS_LIST_HEADER)) { - $RSS_LIST_HEADER = " + $RSS_LIST_HEADER = "
- + "; }
".RSS_LAN_ADMIN_4." ".RSS_PLUGIN_LAN_6."