X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=a0b883bce3306ee472d92172329c091c441c5f69;hb=a74cbdf4f8838f216ebb1a201943575177ffe9a5;hp=be92fb3e241fd1d3f01d3bd5a217c8e04aef5bbe;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index be92fb3e24..a0b883bce3 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -60,12 +60,12 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 				// Rewrite all entries
 				foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {
 					// Do we have login or regular entries?
-					if ($key == 'login') {
-						// Login, so use id
-						$admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx];
-					} else {
-						// Regular entry so use login
+					if ($key == 'admin_id') {
+						// Admin id, so use login
 						$admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];
+					} else {
+						// Regular entry so use id
+						$admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx];
 					}
 				} // END - foreach
 			} // END - foreach
@@ -83,7 +83,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 		$GLOBALS['cache_instance']->removeCacheFile();
 		unset($GLOBALS['cache_array']['admin']);
 	}
-} elseif (getOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
 	// Create cache file
 	$GLOBALS['cache_instance']->init();
 
@@ -116,7 +116,7 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
 	if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
 		// Load referal system from cache
 		$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
-	} elseif (getOutputMode() != 1) {
+	} elseif (isHtmlOutputMode()) {
 		// Create cache file here
 		$GLOBALS['cache_instance']->init();