1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-26 09:20:28 +02:00

Forum now utilizes THEME_LEGACY check for template loading.

This commit is contained in:
Cameron
2017-01-15 09:08:50 -08:00
parent de1ec15976
commit 33d033536c
3 changed files with 16 additions and 11 deletions

View File

@@ -309,28 +309,33 @@ str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_top
if(empty($FORUM_TEMPLATE)) if(empty($FORUM_TEMPLATE))
{ {
// include(e_PLUGIN.'forum/templates/forum_template.php'); // include(e_PLUGIN.'forum/templates/forum_template.php');
// Override with theme template // Override with theme template
if (file_exists(THEME.'forum_template.php')) //v1.x fallback. if(THEME_LEGACY !== true) //v2.x
{
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers.
}
elseif (file_exists(THEME.'forum_template.php')) //v1.x fallback.
{ {
include(e_PLUGIN.'forum/templates/forum_template.php'); include(e_PLUGIN.'forum/templates/forum_template.php');
include_once(THEME.'forum_template.php'); include_once(THEME.'forum_template.php');
} }
elseif(file_exists(THEME.'templates/forum/forum_template.php')) elseif(file_exists(THEME.'templates/forum/forum_template.php'))
{ {
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // $FORUM_TEMPLATE = e107::getTemplate('forum','forum');
require_once(THEME.'templates/forum/forum_template.php'); require_once(THEME.'templates/forum/forum_template.php');
} }
else //v2.x else
{ {
$FORUM_TEMPLATE = e107::getTemplate('forum','forum'); // required to use v2.x wrapper shortcode wrappers. require_once(e_PLUGIN.'forum/templates/forum_template.php');
} }
} }
if(is_array($FORUM_TEMPLATE)) // new v2.x format. if(is_array($FORUM_TEMPLATE) && THEME_LEGACY !== true) // new v2.x format.
{ {
if(varset($FORUM_TEMPLATE['main-start'])) // correction of previous v2.x setup. if(varset($FORUM_TEMPLATE['main-start'])) // correction of previous v2.x setup.

View File

@@ -131,7 +131,7 @@ $forumInfo = $forum->forumGet($forumId);
if (empty($FORUM_VIEW_START)) if (empty($FORUM_VIEW_START))
{ {
if(deftrue('BOOTSTRAP')) if(THEME_LEGACY !== true)
{ {
$FORUM_VIEWFORUM_TEMPLATE = e107::getTemplate('forum','forum_viewforum'); $FORUM_VIEWFORUM_TEMPLATE = e107::getTemplate('forum','forum_viewforum');
} }
@@ -141,11 +141,11 @@ if (empty($FORUM_VIEW_START))
{ {
require_once(THEME.'templates/forum/forum_viewforum_template.php'); require_once(THEME.'templates/forum/forum_viewforum_template.php');
} }
elseif (file_exists(THEME.'forum_viewforum_template.php')) elseif (file_exists(THEME.'forum_viewforum_template.php')) //v1.x
{ {
require_once(THEME.'forum_viewforum_template.php'); require_once(THEME.'forum_viewforum_template.php');
} }
elseif (file_exists(THEME.'forum_template.php')) elseif (file_exists(THEME.'forum_template.php')) //v1.x
{ {
require_once(THEME.'forum_template.php'); require_once(THEME.'forum_template.php');
} }
@@ -160,7 +160,7 @@ if (empty($FORUM_VIEW_START))
} }
if(!empty($FORUM_VIEWFORUM_TEMPLATE) && is_array($FORUM_VIEWFORUM_TEMPLATE) && deftrue('BOOTSTRAP',false)) // New v2.x bootstrap Template. if(!empty($FORUM_VIEWFORUM_TEMPLATE) && is_array($FORUM_VIEWFORUM_TEMPLATE) && THEME_LEGACY !== true) // New v2.x bootstrap Template.
{ {
$FORUM_VIEW_CAPTION = $FORUM_VIEWFORUM_TEMPLATE['caption']; $FORUM_VIEW_CAPTION = $FORUM_VIEWFORUM_TEMPLATE['caption'];

View File

@@ -205,7 +205,7 @@ if(file_exists(THEME.'forum_design.php')) // legacy file
// New in v2.x // New in v2.x
if(deftrue('BOOTSTRAP',false)) if(THEME_LEGACY !== true)
{ {
$FORUM_VIEWTOPIC_TEMPLATE = e107::getTemplate('forum','forum_viewtopic'); $FORUM_VIEWTOPIC_TEMPLATE = e107::getTemplate('forum','forum_viewtopic');
@@ -220,7 +220,7 @@ if(deftrue('BOOTSTRAP',false))
} }
else else
{ {
if (!vartrue($FORUMSTART)) if (empty($FORUMSTART))
{ {
if(file_exists(THEME.'forum_viewtopic_template.php')) if(file_exists(THEME.'forum_viewtopic_template.php'))
{ {