mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 13:41:52 +02:00
Code Issues Releases Wiki Activity

Issue - 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
e107_handlers
comment_class.php
e107_plugins/news
news.php

2
e107_handlers/comment_class.php

@ -61,7 +61,7 @@ class comment
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
}

5
e107_plugins/news/news.php

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