debug_report_bug() does call app_die() again (internal TODO), nicer template for...

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

diff --git a/inc/loader/load_cache-impressum.php b/inc/loader/load_cache-impressum.php
index 20ed9562b6f99a80dde2e39ec4fe03fd694d852a..bfaf12fde5fa0ad6a6222ac8362b7aa89e2a5e6e 100644 (file)
--- a/inc/loader/load_cache-impressum.php
+++ b/inc/loader/load_cache-impressum.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/24/2009 *
- * ===============                              Last change: 10/24/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 10/24/2009 *
+ * ===================                          Last change: 10/24/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-                                      *
@@ -44,13 +44,16 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+
 // Let's start with the admins table...
 if (($GLOBALS['cache_instance']->loadCacheFile('imprint')) && ($GLOBALS['cache_instance']->extensionVersionMatches('imprint'))) {
        // Load cache
        $GLOBALS['cache_array']['imprint'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (getOutputMode() != '1') {
+} elseif (getOutputMode() != 1) {
        // Create cache file
-       $GLOBALS['cache_instance']->init('imprint');
+       $GLOBALS['cache_instance']->init();
 
        // Load every data from DB to cache file
        $add = runFilterChain('sql_admin_extra_data');
@@ -68,9 +71,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('imprint')) && ($GLOBALS['cache_i
        // Close cache
        $GLOBALS['cache_instance']->storeExtensionVersion('imprint');
        $GLOBALS['cache_instance']->finalize();
-
-       // Include loader again
-       loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]