Mailer used in many places, we still need a good 'selling' title

[mailer.git] / inc / loader / load_cache-extension.php

diff --git a/inc/loader/load_cache-extension.php b/inc/loader/load_cache-extension.php
index d765f85846991b6f072a894d730cae44cf8d0be4..1216757563375ae986e95233b833de4dc7cd9b52 100644 (file)
--- 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                        *
@@ -43,6 +43,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 +65,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
 
@@ -128,9 +131,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 +182,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]