jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2674 from annando/1607-warning-theme-info

Browse source 
Bugfix: Avoid a warning if "theme_info" isn't an array
This commit is contained in:
Tobias Diekershoff 2016-07-12 16:16:19 +02:00 committed by GitHub
commit 57762a8038
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/plugin.php
View file

@ -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';
@ -571,4 +571,4 @@ function theme_include($file, $root = '') {
return $p; return $p;
} }
return ''; return '';
} }