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

Fixes #4382 - Init theme shortcodes later.

Browse Source
This commit is contained in:
Cameron
2021-02-14 08:14:57 -08:00
parent aee77a102f
commit a448c00a1d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_core/templates/header_default.php
View File

@@ -33,6 +33,11 @@ $e107 = e107::getInstance();
$sql = e107::getDb(); $sql = e107::getDb();
e107::getDebug()->logTime('(Header Top)'); e107::getDebug()->logTime('(Header Top)');
if($themeSC = e107::getScBatch('theme')) // init theme_shortcodes after THEME_LAYOUT is available.
{
$themeSC->init();
unset($themeSC);
}
e107::getRender()->init(); e107::getRender()->init();

2
e107_handlers/shortcode_handler.php
View File

@@ -292,7 +292,7 @@ class e_parse_shortcode
{ {
$this->scClasses[$class] = new $class(); $this->scClasses[$class] = new $class();
if(method_exists($this->scClasses[$class], 'init')) if($class !== 'theme_shortcodes' && method_exists($this->scClasses[$class], 'init'))
{ {
$this->scClasses[$class]->init(); $this->scClasses[$class]->init();
} }