forked from extern/egroupware
need to compare short names, as long name generated by prefixing with template-name is not found, because different template name
This commit is contained in:
parent
49bacaef69
commit
e8ac0674e1
@ -95,21 +95,17 @@
|
|||||||
$names = explode('|',$tab_names);
|
$names = explode('|',$tab_names);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$short_names = array();
|
||||||
|
foreach($names as $name)
|
||||||
|
{
|
||||||
|
$nparts = explode('.', $name);
|
||||||
|
$short_names[] = array_pop($nparts);
|
||||||
|
}
|
||||||
// disable tab mentioned in readonlys
|
// disable tab mentioned in readonlys
|
||||||
foreach(is_array($readonlys) ? $readonlys : array($readonlys => true) as $name => $disable)
|
foreach(is_array($readonlys) ? $readonlys : array($readonlys => true) as $name => $disable)
|
||||||
{
|
{
|
||||||
// check full name AND last component name
|
|
||||||
if (strpos($name, '.') === false)
|
|
||||||
{
|
|
||||||
$name2 = $tmpl->name.'.'.$name;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$nparts = explode('.', $name);
|
|
||||||
$name2 = array_pop($nparts);
|
|
||||||
}
|
|
||||||
if ($name && $disable && (($key = array_search($name, $names)) !== false ||
|
if ($name && $disable && (($key = array_search($name, $names)) !== false ||
|
||||||
($key = array_search($name2, $names)) !== false))
|
($key = array_search($name, $short_names) !== false)))
|
||||||
{
|
{
|
||||||
unset($names[$key]);
|
unset($names[$key]);
|
||||||
$names = array_values($names);
|
$names = array_values($names);
|
||||||
|
Loading…
Reference in New Issue
Block a user