But only when it is not empty

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

diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php
index 84e1dc4fddf95d9422c141a884c9cd2523166513..68562bf270c1c68a40c0258a1200a34345c64818 100644 (file)
--- a/inc/loader/load-modules.php
+++ b/inc/loader/load-modules.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 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 *
@@ -39,8 +39,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 module registry (mod_reg)...
@@ -57,7 +57,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                $GLOBALS['cache_instance']->removeCacheFile();
 
                // We should fix this
-               debug_report_bug(__FILE__, __LINE__, 'modArray=<pre>' . print_r($modArray, true) . '</pre>Please try to reload to fix this.');
+               reportBug(__FILE__, __LINE__, 'modArray=<pre>' . print_r($modArray, TRUE) . '</pre>Please try to reload to fix this.');
        } // END - if
 
        // Rewrite some parts
@@ -68,7 +68,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                // Is ext-sql_patches newer or equal 0.3.6?
                if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
                        // Add 'has_menu'
-                       $entries[] = 'has_menu';
+                       array_push($entries, 'has_menu');
                } // END - if
 
                // Add all
@@ -87,11 +87,11 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                } // END - foreach
        } // END - foreach
        unset($modArray);
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
-       // Do we have up-to-date ext-sql_patches?
+       // Is there up-to-date ext-sql_patches?
        if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
                // Yes, has_menu shall be there
                $result = SQL_QUERY('SELECT