1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-10 16:46:50 +02:00

Issue #4757 Prevent infinite loop and possible PHP 8.1 errors.

This commit is contained in:
Cameron
2022-04-21 10:54:43 -07:00
parent cf20dfc36b
commit c2fc8fce0a
5 changed files with 20 additions and 12 deletions

View File

@@ -656,6 +656,12 @@ if(!isset($_E107['no_event']))
$dbg->logTime('Register Core Events');
e107::getNotify()->registerEvents();
}
if(!defined('SITENAME')) // Allow override by English_custom.php or English_global.php plugin files.
{
define('SITENAME', trim($tp->toHTML($pref['sitename'], '', 'USER_TITLE,er_on,defs')));
}
//
// O: Start user session
//
@@ -680,10 +686,7 @@ $developerMode = (vartrue($pref['developer'],false) || E107_DEBUG_LEVEL > 0);
// for multi-language these definitions needs to come after the language loaded.
if(!defined('SITENAME')) // Allow override by English_custom.php or English_global.php plugin files.
{
define('SITENAME', trim($tp->toHTML($pref['sitename'], '', 'USER_TITLE,er_on,defs')));
}
if(!defined('SITEDESCRIPTION')) // Allow override by English_custom.php or English_global.php plugin files.
{
define('SITEDESCRIPTION', $tp->toHTML($pref['sitedescription'], '', 'emotes_off,defs'));