X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-extension.php;h=95dd73c7bf55f4b369652fb0012f9f5346bd2f08;hb=af5059252c53c8802929611bf322ca4597b70146;hp=d765f85846991b6f072a894d730cae44cf8d0be4;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/loader/load_cache-extension.php b/inc/loader/load_cache-extension.php
index d765f85846..95dd73c7bf 100644
--- a/inc/loader/load_cache-extension.php
+++ b/inc/loader/load_cache-extension.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/26/2004 *
- * ===============                              Last change: 07/01/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 06/26/2004 *
+ * ===================                          Last change: 07/01/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-extensions.php                        *
@@ -20,6 +20,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,6 +44,9 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+
 // Next cached table is the extension
 if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
 	// Load extension from cache
@@ -62,7 +66,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 			if ($EXT_DUMMY['ext_css'][$k] == 'Y') addExtensionCssFile($name . '.css');
 
 			// Load extension file itself
-			if ((($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y') || (isAdmin()))) {
+			if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y')) {
 				$EXT_POOL[] = $name;
 			} // END - if
 
@@ -98,7 +102,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 			$EXT_DUMMY['ext_deprecated'][$name] = 'N';
 
 			// Mark it as active extension
-			$GLOBALS['cache_array']['active_extensions'][$name] = $EXT_DUMMY['ext_keep'][$k];
+			$GLOBALS['cache_array']['always_active'][$name] = $EXT_DUMMY['ext_keep'][$k];
 			unset($EXT_DUMMY['ext_keep'][$k]);
 
 			// Remove unneccessary data from memory
@@ -128,9 +132,9 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
 	// Remove array and mark cache as loaded
 	unset($EXT_POOL);
-} elseif (getOutputMode() != '1') {
+} elseif (getOutputMode() != 1) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init('extension');
+	$GLOBALS['cache_instance']->init();
 
 	// Add more if sql_patches is recent enougth
 	$add = '';
@@ -179,9 +183,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 	// Close the cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]