From 56835bb144162b334433586fd4bd5f09a5e9f396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Sep 2018 08:34:18 +0200 Subject: [PATCH 1/3] Update English_admin_rss_menu.php Issue: #3410 --- e107_plugins/rss_menu/languages/English_admin_rss_menu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/rss_menu/languages/English_admin_rss_menu.php b/e107_plugins/rss_menu/languages/English_admin_rss_menu.php index 898a33a0a..24461c665 100644 --- a/e107_plugins/rss_menu/languages/English_admin_rss_menu.php +++ b/e107_plugins/rss_menu/languages/English_admin_rss_menu.php @@ -48,7 +48,7 @@ define("RSS_LAN_ADMINMENU_1", "RSS Options"); define("RSS_LAN_ADMINMENU_2", "Listing"); define("RSS_LAN_ADMINMENU_4", "Import"); -define("RSS_LAN_ERROR_1", "This is not a valid rss feed.[br][br][Return to rss feed list]"); +define("RSS_LAN_ERROR_1", "This is not a valid rss feed. [Return to rss feed list]"); define("RSS_LAN_ERROR_2", "Your e107_config.php file or your language files contain spaces or  characters before the <? characters. You should remove this with a non-utf8 text-editor if you wish to have a valid RSS feed."); define("RSS_LAN_ERROR_3", "No rss feeds are present yet[br]please use the import feature to import available rss feeds or create a rss feed manually."); define("RSS_LAN_ERROR_4", "No rss feeds are available yet"); @@ -104,4 +104,4 @@ define("LAN_AL_RSS_05","RSS limits updated"); define("LAN_AL_RSS_06","RSS settings updated"); define("LAN_AL_RSS_07",""); */ -?> \ No newline at end of file +?> From d9298745fcc3645b843067619ffbc8449568c7e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Sep 2018 08:36:52 +0200 Subject: [PATCH 2/3] Update rss_setup.php --- e107_plugins/rss_menu/rss_setup.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/e107_plugins/rss_menu/rss_setup.php b/e107_plugins/rss_menu/rss_setup.php index 3e40b197a..5abb85828 100644 --- a/e107_plugins/rss_menu/rss_setup.php +++ b/e107_plugins/rss_menu/rss_setup.php @@ -9,6 +9,7 @@ * Custom FAQ install/uninstall/update routines * */ +e107::includeLan(e_PLUGIN.'rss_menu/languages/'.e_LANGUAGE.'_admin_rss_menu.php'); class rss_menu_setup { @@ -26,11 +27,11 @@ class rss_menu_setup $insert = array( 'rss_id' => 0, - 'rss_name' => 'News', + 'rss_name' => RSS_NEWS, 'rss_url' => 'news', 'rss_topicid' => '', 'rss_path' => 'news', - 'rss_text' => 'The rss feed of the news', + 'rss_text' => RSS_PLUGIN_LAN_7, 'rss_datestamp' => time(), 'rss_class' => '0', 'rss_limit' => '9' From c7f3360eedc753f1845929630e1eb35b7b98a3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Sun, 30 Sep 2018 08:38:17 +0200 Subject: [PATCH 3/3] Update rss.php --- e107_plugins/rss_menu/rss.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/rss_menu/rss.php b/e107_plugins/rss_menu/rss.php index 1562b9d9b..685d4478d 100644 --- a/e107_plugins/rss_menu/rss.php +++ b/e107_plugins/rss_menu/rss.php @@ -137,7 +137,7 @@ if(!$sql->select('rss', '*', "rss_class!=2 AND rss_url='".$content_type."' ".$ch if(!$sql->select('rss', '*', "rss_class!=2 AND rss_url='".$content_type."' ".$check_topic." AND rss_limit>0 ")) { require_once(HEADERF); - $repl = array("", ""); + $repl = array("

", ""); $message = str_replace(array("[","]"), $repl, RSS_LAN_ERROR_1); $ns->tablerender('', $message); require_once(FOOTERF); @@ -809,4 +809,4 @@ class rssCreate $tmp = explode("@",$text); return ($tmp[0] != "") ? $tmp[0].RSS_LAN_2 : RSS_LAN_3; } -} // End class rssCreate \ No newline at end of file +} // End class rssCreate