Fix: Restore backward compatibility with old modules
This commit is contained in:
parent
58fffb9a2d
commit
ad2b5f6449
@ -256,7 +256,6 @@ foreach ($conf->file->dol_document_root as $dirroot)
|
|||||||
$modulequalified=1;
|
$modulequalified=1;
|
||||||
|
|
||||||
// We discard modules that does not respect constraint on menu handlers
|
// We discard modules that does not respect constraint on menu handlers
|
||||||
//if (! empty($objMod->needleftmenu) && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
|
|
||||||
if (! empty($objMod->needtopmenu) && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
|
if (! empty($objMod->needtopmenu) && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
|
||||||
|
|
||||||
// We discard modules according to features level (PS: if module is activated we always show it)
|
// We discard modules according to features level (PS: if module is activated we always show it)
|
||||||
|
|||||||
@ -90,8 +90,6 @@ $var=!$var;
|
|||||||
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme."</td></tr>\n";
|
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme."</td></tr>\n";
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentMenuHandler").'</td><td colspan="2">'.$conf->top_menu."</td></tr>\n";
|
print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentMenuHandler").'</td><td colspan="2">'.$conf->top_menu."</td></tr>\n";
|
||||||
//$var=!$var;
|
|
||||||
//print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentLeftMenuHandler").'</td><td colspan="2">'.$conf->left_menu."</td></tr>\n";
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
|
|||||||
@ -84,6 +84,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
|
|||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
|
|
||||||
left_menu('', $help_url, '', $menu->liste);
|
left_menu('', $help_url, '', $menu->liste, 1);
|
||||||
|
main_area();
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -96,7 +96,8 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
|
|||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
}
|
}
|
||||||
|
|
||||||
left_menu('', $help_url, '', $menu->liste);
|
left_menu('', $help_url, '', $menu->liste, 1);
|
||||||
|
main_area();
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -53,6 +53,7 @@ function llxHeader($head = '', $title='', $help_url='', $morehtml='')
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
left_menu($menu->liste, $help_url, $morehtml, '');
|
left_menu($menu->liste, $help_url, $morehtml, '', 1);
|
||||||
|
main_area();
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -105,7 +105,6 @@ foreach ($dirlist as $dirroot)
|
|||||||
$modulequalified=1;
|
$modulequalified=1;
|
||||||
|
|
||||||
// We discard modules that does not respect constraint on menu handlers
|
// We discard modules that does not respect constraint on menu handlers
|
||||||
//if ($objMod->needleftmenu && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
|
|
||||||
if ($objMod->needtopmenu && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
|
if ($objMod->needtopmenu && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
|
||||||
|
|
||||||
// We discard modules according to features level (PS: if module is activated we always show it)
|
// We discard modules according to features level (PS: if module is activated we always show it)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user