Further fixes for all resets

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

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 8452a87aa2dae03c2af5fa091267e10045009372..841274af01293cf79d3e63c1a8a60d4b8378dd3b 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -18,7 +18,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,8 +41,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the extension
@@ -132,14 +132,15 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
        // Remove array and mark cache as loaded
        unset($EXT_POOL);
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
        // Add more if ext-sql_patches is recent enougth
        $add = '';
        if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
-               $add = ',`ext_has_css` AS `ext_css`';
+               // Old naming
+               $add = ', `ext_has_css` AS `ext_css`';
        } // END - if
 
        // Query for all extensions