extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a bunch of PHP Warnings

Browse Source
This commit is contained in:
Ralf Becker 2021-10-12 11:51:28 +02:00
parent 8604fc3181
commit 7248b6649b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Framework/Bundle.php
View File

@ -89,7 +89,7 @@ class Bundle
if (!in_array($bundle, $included_bundles)) if (!in_array($bundle, $included_bundles))
{ {
$included_bundles[] = $bundle; $included_bundles[] = $bundle;
$minurl = self::$bundle2minurl[$bundle]; $minurl = self::$bundle2minurl[$bundle] ?? null;
if (!isset($minurl) && isset($GLOBALS['egw_info']['apps'][$bundle])) if (!isset($minurl) && isset($GLOBALS['egw_info']['apps'][$bundle]))
{ {
$minurl = '/'.$bundle.'/js/app.min.js'; $minurl = '/'.$bundle.'/js/app.min.js';
@ -148,7 +148,7 @@ class Bundle
*/ */
protected static function urls(array $js_includes, &$max_modified=null, $minurl=null) protected static function urls(array $js_includes, &$max_modified=null, $minurl=null)
{ {
$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True'; $debug_minify = !empty($GLOBALS['egw_info']['server']['debug_minify']) && $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
// ignore not existing minurl // ignore not existing minurl
if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl)) $minurl = null; if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl)) $minurl = null;
$to_include_first = $to_include = $to_minify = array(); $to_include_first = $to_include = $to_minify = array();
@ -158,7 +158,7 @@ class Bundle
{ {
if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle if ($path == '/api/js/jsapi/egw.js') continue; // Leave egw.js out of bundle
unset($query); unset($query);
list($path,$query) = explode('?',$path,2); list($path,$query) = explode('?',$path,2)+[null,null];
$mod = filemtime(EGW_SERVER_ROOT.$path); $mod = filemtime(EGW_SERVER_ROOT.$path);
if ($mod > $max_modified) $max_modified = $mod; if ($mod > $max_modified) $max_modified = $mod;