extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix array_merge(): Argument #2 must be of type array, int given

Browse Source
This commit is contained in:
ralf 2022-11-28 14:04:24 +01:00
parent 154b0da56d
commit 5556e22927
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/inc/class.resources_ui.inc.php
View File

@ -476,11 +476,11 @@ class resources_ui
} }
$nm_session_data = Api\Cache::getSession('resources', 'index_nm'); $nm_session_data = Api\Cache::getSession('resources', 'index_nm');
$res_id = is_numeric($content) ? (int)$content : $content['res_id']; $res_id = is_scalar($content) && is_numeric($content) ? (int)$content : $content['res_id'];
if (isset($_GET['res_id'])) $res_id = $_GET['res_id']; if (isset($_GET['res_id'])) $res_id = $_GET['res_id'];
if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0) $accessory_of = $nm_session_data['filter2']; if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0) $accessory_of = $nm_session_data['filter2'];
if (isset($_GET['accessory_of'])) $accessory_of = $_GET['accessory_of']; if (isset($_GET['accessory_of'])) $accessory_of = $_GET['accessory_of'];
$content = $content ?? array('res_id' => $res_id); $content = is_array($content) ? $content : array('res_id' => $res_id);
if ($res_id > 0) if ($res_id > 0)
{ {
$content = array_merge($this->bo->read($res_id), $content); $content = array_merge($this->bo->read($res_id), $content);
@ -589,4 +589,3 @@ class resources_ui
} }
} }