Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update English_admin_rss_menu.php #3479

Merged
merged 3 commits into from
Sep 30, 2018
Merged

Update English_admin_rss_menu.php #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56835bb
Update English_admin_rss_menu.php
yesszus Sep 30, 2018
d929874
Update rss_setup.php
yesszus Sep 30, 2018
c7f3360
Update rss.php
yesszus Sep 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e107_plugins/rss_menu/languages/English_admin_rss_menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
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");
Expand Down Expand Up @@ -104,4 +104,4 @@
define("LAN_AL_RSS_06","RSS settings updated");
define("LAN_AL_RSS_07","");
*/
?>
?>
4 changes: 2 additions & 2 deletions e107_plugins/rss_menu/rss.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
if(!$sql->select('rss', '*', "rss_class!=2 AND rss_url='".$content_type."' ".$check_topic." AND rss_limit>0 "))
{
require_once(HEADERF);
$repl = array("<a href='".e_REQUEST_SELF."'>", "</a>");
$repl = array("<br /><br /><a href='".e_REQUEST_SELF."'>", "</a>");
$message = str_replace(array("[","]"), $repl, RSS_LAN_ERROR_1);
$ns->tablerender('', $message);
require_once(FOOTERF);
Expand Down Expand Up @@ -809,4 +809,4 @@ function nospam($text)
$tmp = explode("@",$text);
return ($tmp[0] != "") ? $tmp[0].RSS_LAN_2 : RSS_LAN_3;
}
} // End class rssCreate
} // End class rssCreate
5 changes: 3 additions & 2 deletions e107_plugins/rss_menu/rss_setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -26,11 +27,11 @@ function install_post($var)

$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'
Expand Down