From f102460ac987ccaae23a28a388dc4a75cad30554 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 17 May 2016 22:04:12 +0200 Subject: [PATCH] fix PHP Fatal if app got removed in filesystem (like eg. our developer_tools) --- api/src/Framework/About.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/api/src/Framework/About.php b/api/src/Framework/About.php index e1e03441b6..30b17878c4 100644 --- a/api/src/Framework/About.php +++ b/api/src/Framework/About.php @@ -92,7 +92,10 @@ from community developers.

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.

} } } - $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;