extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-06 13:30:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure keys in admin tree are unique, as we overwrite tree entries otherwise

Browse Source
This commit is contained in:
Ralf Becker 2015-07-03 12:27:31 +00:00
parent aa5a72db84
commit 2744ec2d22
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/inc/class.admin_ui.inc.php
View File

@ -372,10 +372,6 @@ class admin_ui
{ {
$data['id'] .= $matches[2][(int)array_search('load', $matches[1])]; $data['id'] .= $matches[2][(int)array_search('load', $matches[1])];
} }
else
{
$data['id'] .= md5($data['link']);
}
} }
if (!empty($data['icon'])) if (!empty($data['icon']))
{ {
@ -416,7 +412,8 @@ class admin_ui
} }
$data['text'] = lang($data['text']); $data['text'] = lang($data['text']);
if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']); if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
// make sure keys are unique, as we overwrite tree entries otherwise
if (isset($parent[$data['id']])) $data['id'] .= md5($data['link']);
$parent[$data['id']] = self::fix_userdata($data); $parent[$data['id']] = self::fix_userdata($data);
} }
} }