holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PHP Fatal if app got removed in filesystem (like eg. our developer_tools)

Browse Source
This commit is contained in:
Ralf Becker 2016-05-17 22:04:12 +02:00
parent 148e1853db
commit f102460ac9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Framework/About.php
View File

@ -92,7 +92,10 @@ from community developers.</p>
foreach (array_keys(isset($GLOBALS['egw_info']['user']['apps']['admin']) ?
$GLOBALS['egw_info']['apps'] : $GLOBALS['egw_info']['user']['apps']) as $app)
{
$apps[] = $this->_getParsedAppInfo($app);
if (($app_info = $this->_getParsedAppInfo($app)))
{
$apps[] = $app_info;
}
}
usort($apps, function($a, $b)
{
@ -165,7 +168,9 @@ from community developers.</p>
}
}
}
$app_info = array_merge($GLOBALS['egw_info']['apps'][$app],$setup_info[$app]);
if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null; // app got eg. removed in filesystem
$app_info = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
// define the return array
$icon_app = isset($app_info['icon_app']) ? $app_info['icon_app'] : $app;