mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Custom Forum title now respected throughout.

Browse Source
This commit is contained in:
Cameron
2016-03-23 17:25:21 -07:00
parent 8282802d5e
commit 825ab74984
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/forum/forum.php
View File

@@ -92,7 +92,7 @@ if(isset($_GET['f']))
$fVars = new e_vars; $fVars = new e_vars;
$gen = new convert; $gen = new convert;
$fVars->FORUMTITLE = LAN_PLUGIN_FORUM_NAME; $fVars->FORUMTITLE = e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME);
$fVars->THREADTITLE = LAN_FORUM_0002; $fVars->THREADTITLE = LAN_FORUM_0002;
$fVars->REPLYTITLE = LAN_FORUM_0003; $fVars->REPLYTITLE = LAN_FORUM_0003;
$fVars->LASTPOSTITLE = LAN_FORUM_0004; $fVars->LASTPOSTITLE = LAN_FORUM_0004;
@@ -417,7 +417,7 @@ function parse_forum($f, $restricted_string = '')
$fVars->FORUMSUBFORUMS = ''; $fVars->FORUMSUBFORUMS = '';
$badgeReplies = ($f['forum_replies']) ? "badge-info" : ""; $badgeReplies = ($f['forum_replies']) ? "badge-info" : "";

8
e107_plugins/forum/forum_class.php
View File

@@ -1971,6 +1971,8 @@ class e107forum
$tp = e107::getParser(); $tp = e107::getParser();
$frm = e107::getForm(); $frm = e107::getForm();
$forumTitle = e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME);
global $FORUM_CRUMB, $forumInfo, $threadInfo, $thread; global $FORUM_CRUMB, $forumInfo, $threadInfo, $thread;
global $BREADCRUMB,$BACKLINK; // Eventually we should deprecate BACKLINK global $BREADCRUMB,$BACKLINK; // Eventually we should deprecate BACKLINK
@@ -1985,7 +1987,7 @@ class e107forum
$FORUM_CRUMB['sitename']['value'] = str_replace($search, $replace, $FORUM_CRUMB['sitename']['value']); $FORUM_CRUMB['sitename']['value'] = str_replace($search, $replace, $FORUM_CRUMB['sitename']['value']);
$search = array('{FORUMS_TITLE}', '{FORUMS_HREF}'); $search = array('{FORUMS_TITLE}', '{FORUMS_HREF}');
$replace = array(LAN_PLUGIN_FORUM_NAME, e107::url('forum','index')); $replace = array($forumTitle, e107::url('forum','index'));
$FORUM_CRUMB['forums']['value'] = str_replace($search, $replace, $FORUM_CRUMB['forums']['value']); $FORUM_CRUMB['forums']['value'] = str_replace($search, $replace, $FORUM_CRUMB['forums']['value']);
$search = array('{PARENT_TITLE}', '{PARENT_HREF}'); $search = array('{PARENT_TITLE}', '{PARENT_HREF}');
@@ -2023,7 +2025,7 @@ class e107forum
$dfltsep = ' :: '; $dfltsep = ' :: ';
$BREADCRUMB = "<a class='forumlink' href='".e_HTTP."index.php'>".SITENAME."</a>".$dfltsep. $BREADCRUMB = "<a class='forumlink' href='".e_HTTP."index.php'>".SITENAME."</a>".$dfltsep.
"<a class='forumlink' href='". e107::url('forum','index')."'>".LAN_PLUGIN_FORUM_NAME."</a>".$dfltsep; "<a class='forumlink' href='". e107::url('forum','index')."'>".$forumTitle."</a>".$dfltsep;
if($forumInfo['sub_parent']) if($forumInfo['sub_parent'])
{ {
@@ -2057,7 +2059,7 @@ class e107forum
$breadcrumb = array(); $breadcrumb = array();
$breadcrumb[] = array('text'=> LAN_PLUGIN_FORUM_NAME , 'url'=> e107::url('forum','index')); $breadcrumb[] = array('text'=> $forumTitle , 'url'=> e107::url('forum','index'));
if($forumInfo['sub_parent']) if($forumInfo['sub_parent'])
{ {

3
e107_plugins/forum/forum_viewtopic.php
View File

@@ -531,7 +531,8 @@ require_once (HEADERF);
if ($forum->prefs->get('enclose')) if ($forum->prefs->get('enclose'))
{ {
$ns->tablerender(LAN_FORUM_1001, $forumstring, $mes->render(). array('forum_viewtopic', 'main')); $forumTitle = e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME);
$ns->tablerender($forumTitle, $forumstring, $mes->render(). array('forum_viewtopic', 'main'));
} }
else else
{ {

2
e107_plugins/forum/languages/English/English_front.php
View File

@@ -118,7 +118,7 @@ define("LAN_FORUM_1004", "Starter"); // LAN_54
define("LAN_FORUM_1005", "Views"); // LAN_56 define("LAN_FORUM_1005", "Views"); // LAN_56
define("LAN_FORUM_1006", "Important Topics"); // LAN_411 (vf) define("LAN_FORUM_1006", "Important Topics"); // LAN_411 (vf)
define("LAN_FORUM_1007", "Forum Topics"); // LAN_412 (vf) define("LAN_FORUM_1007", "Topics"); // LAN_412 (vf)
define("LAN_FORUM_1008", "There are no topics in this forum yet."); // LAN_58 define("LAN_FORUM_1008", "There are no topics in this forum yet."); // LAN_58
define("LAN_FORUM_1009", "This forum is moderated by"); // LAN_404 define("LAN_FORUM_1009", "This forum is moderated by"); // LAN_404
define("LAN_FORUM_1010", "[popular]"); // LAN_395 (vf) define("LAN_FORUM_1010", "[popular]"); // LAN_395 (vf)