X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=e5427c7409fafb4d3f3ffc60e604b1ab59f31d10;hp=df9eeac2674c86c6f08e0f03b12cc46d9daf16ff;hb=9b8fe454a575a1f000b00bc7ca37eaad6d59d21a;hpb=0533bba499e23b91209b91f40737058a36f40ffe diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index df9eeac267..e5427c7409 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -240,7 +240,7 @@ function isAdminAllowedAccessMenu ($action, $what = null) { if (!isset($GLOBALS[__FUNCTION__][$action][$what])) { // ACL is always 'allow' when no ext-admins is installed // @TODO This can be rewritten into a filter - $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (adminsCheckAdminAcl($action, $what))); + $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (isAdminsAllowedByAcl($action, $what))); } // END - if // Return the cached value @@ -334,7 +334,8 @@ ORDER BY // Do we have entries? if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) { $GLOBALS['menu']['description'] = array(); - $GLOBALS['menu']['title'] = array(); $SUB = true; + $GLOBALS['menu']['title'] = array(); + $SUB = true; $OUT .= '