Rewrite of all mail templates with user data to new 'tag-like' functionality

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 327e51147f14261741e49015bbf8f0d1dd1e414c..97aab22bfebb4c94ab3b1e4dcd38e076af164eaa 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -737,7 +737,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 function adminGetMenuMode () {
        // Set the global mode as the mode for all admins
        $mode = getConfig('admin_menu');
-       $ADMIN = $mode;
+       $adminMode = $mode;
 
        // Get admin id
        $adminId = getCurrentAdminId();
@@ -745,7 +745,7 @@ function adminGetMenuMode () {
        // Check individual settings of current admin
        if (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
                // Load from cache
-               $ADMIN = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
+               $adminMode = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
                incrementStatsEntry('cache_hits');
        } elseif (isExtensionInstalledAndNewer('admins', '0.6.7')) {
                // Load from database when version of 'admins' is enough
@@ -753,7 +753,7 @@ function adminGetMenuMode () {
                        array($adminId), __FUNCTION__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load data
-                       list($ADMIN) = SQL_FETCHROW($result);
+                       list($adminMode) = SQL_FETCHROW($result);
                }
 
                // Free memory
@@ -761,7 +761,7 @@ function adminGetMenuMode () {
        }
 
        // Check what the admin wants and set it when it's not the global mode
-       if ($ADMIN != 'global') $mode = $ADMIN;
+       if ($adminMode != 'global') $mode = $adminMode;
 
        // Return admin-menu's mode
        return $mode;