extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 12:29:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure cat_id is not null before merging content otherwise it would override the fetched content wrong value

Browse Source
This commit is contained in:
Hadi Nategh 2022-12-07 12:30:02 +01:00
parent 4debde6efa
commit 872b272459
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,7 +480,7 @@ class resources_ui
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($_GET['accessory_of'])) $accessory_of = $_GET['accessory_of'];
$content = is_array($content) ? $content : array('res_id' => $res_id, 'cat_id' => $content['cat_id']);
$content = is_array($content) ? $content : array('res_id' => $res_id) + ($content['cat_id'] ? ['cat_id' => $content['cat_id']] : []);
if ($res_id > 0)
{
$content = array_merge($this->bo->read($res_id), $content);