Merge pull request #2674 from annando/1607-warning-theme-info
Bugfix: Avoid a warning if "theme_info" isn't an array
This commit is contained in:
commit
57762a8038
1 changed files with 2 additions and 2 deletions
|
@ -551,7 +551,7 @@ function theme_include($file, $root = '') {
|
||||||
if($root !== '' && $root[strlen($root)-1] !== '/')
|
if($root !== '' && $root[strlen($root)-1] !== '/')
|
||||||
$root = $root . '/';
|
$root = $root . '/';
|
||||||
$theme_info = $a->theme_info;
|
$theme_info = $a->theme_info;
|
||||||
if(array_key_exists('extends',$theme_info))
|
if(is_array($theme_info) AND array_key_exists('extends',$theme_info))
|
||||||
$parent = $theme_info['extends'];
|
$parent = $theme_info['extends'];
|
||||||
else
|
else
|
||||||
$parent = 'NOPATH';
|
$parent = 'NOPATH';
|
||||||
|
|
Loading…
Reference in a new issue