mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Issue #4124 - Avoid legacy globals with v2.x theme templates.

Browse Source
This commit is contained in:
Cameron
2020-04-20 11:49:19 -07:00
parent 6b9b2f7013
commit ab925f43cc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/comment_class.php
View File

@@ -61,7 +61,7 @@ class comment
global $COMMENTSTYLE; global $COMMENTSTYLE;
if (!$COMMENTSTYLE) if (empty($COMMENTSTYLE) || !deftrue('THEME_LEGACY')) // v2.x
{ {
require(e107::coreTemplatePath('comment')); // using require_once() could cause an empty template if the template is already loaded, for example, by the comment-menu al require(e107::coreTemplatePath('comment')); // using require_once() could cause an empty template if the template is already loaded, for example, by the comment-menu al
} }

5
e107_plugins/news/news.php
View File

@@ -1197,12 +1197,11 @@ class news_front
$caption = null; $caption = null;
$render = false; $render = false;
if(!empty($NEWSSTYLE)) if(deftrue('THEME_LEGACY') && !empty($NEWSSTYLE))
{ {
$template = $NEWSSTYLE; $template = $NEWSSTYLE;
} }
elseif(function_exists("news_style")) // BC elseif(deftrue('THEME_LEGACY') && function_exists("news_style")) // BC
{ {
$template = news_style($news, 'extend', $param); $template = news_style($news, 'extend', $param);
} }