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

This commit is contained in:
Ralf Becker 2015-07-03 12:27:31 +00:00
parent aa5a72db84
commit 2744ec2d22

View File

@ -372,10 +372,6 @@ class admin_ui
{
$data['id'] .= $matches[2][(int)array_search('load', $matches[1])];
}
else
{
$data['id'] .= md5($data['link']);
}
}
if (!empty($data['icon']))
{
@ -416,7 +412,8 @@ class admin_ui
}
$data['text'] = lang($data['text']);
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);
}
}