extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-29 17:28:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

try fixing "Unsupported operand types" reported by Alexandros

Browse Source 
Probably cause by Policy app not being installed.
This commit is contained in:
Ralf Becker 2018-08-22 11:10:11 +02:00
parent 613455a784
commit a53560a546
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/inc/class.admin_config.inc.php
View File

@ -127,7 +127,7 @@ class admin_config
} }
$c = new Api\Config($config_appname); $c = new Api\Config($config_appname);
$old = $c->read_repository(); $old = (array)$c->read_repository();
if ($_content['cancel'] || ($_content['save'] || $_content['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin')) if ($_content['cancel'] || ($_content['save'] || $_content['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
{ {
Api\Framework::redirect_link('/admin/index.php?ajax=true'); Api\Framework::redirect_link('/admin/index.php?ajax=true');
@ -139,7 +139,7 @@ class admin_config
$_POST = array('newsettings' => &$_content['newsettings']); $_POST = array('newsettings' => &$_content['newsettings']);
// Remove actual files (cleanup) of deselected urls from login_background_file // Remove actual files (cleanup) of deselected urls from login_background_file
$this->remove_anon_images(array_diff($c->config_data['login_background_file'], $_content['newsettings']['login_background_file'])); $this->remove_anon_images(array_diff((array)$c->config_data['login_background_file'], $_content['newsettings']['login_background_file']));
/* Load hook file with functions to validate each config (one/none/all) */ /* Load hook file with functions to validate each config (one/none/all) */
Api\Hooks::single(array( Api\Hooks::single(array(
@ -196,7 +196,7 @@ class admin_config
if ($set) if ($set)
{ {
$cmd = new admin_cmd_config($config_appname, $set, $old, $cmd = new admin_cmd_config($config_appname, $set, $old,
$_content['admin_cmd']+array('appname' => $_appname)); (array)$_content['admin_cmd']+array('appname' => $_appname));
$msg = $cmd->run(); $msg = $cmd->run();
} }
else else