X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-modules.php;h=e957bc63be0d835b5842cced44972bdb131a1a2d;hb=215d0d0d066ee2924ec8fa4b8efe6bf93358ad6f;hp=a1152a0d77e27d0ff7839b58fcedbd114218f19f;hpb=06d97fddd5c72e2b1c14ddb855b7eddc53f169a7;p=mailer.git

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index a1152a0d77..e957bc63be 100644
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/09/2008 *
- * ===============                              Last change: 09/09/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/09/2008 *
+ * ===================                          Last change: 09/09/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-modules.php                           *
@@ -70,19 +70,27 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
 		} // END - if
 	} // END - foreach
 	unset($modArray);
-} elseif (getOutputMode() != '1') {
+} elseif (getOutputMode() != 1) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init('MODULES');
+	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
 	if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
 		// Load has_menu
-		$result = SQL_QUERY('SELECT id, module, title, locked, hidden, admin_only, title, mem_only, has_menu
-FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `id`', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT
+	`id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`, `has_menu`
+FROM
+	`{?_MYSQL_PREFIX?}_mod_reg`
+ORDER BY
+	`module` ASC', __FILE__, __LINE__);
 	} else {
 		// Don't load has_menu
-		$result = SQL_QUERY('SELECT id, module, title, locked, hidden, admin_only, title, mem_only
-FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `id`', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT
+	`id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`
+FROM
+	`{?_MYSQL_PREFIX?}_mod_reg`
+ORDER BY
+	`module` ASC', __FILE__, __LINE__);
 	}
 
 	// Cache all data
@@ -97,9 +105,6 @@ FROM `{?_MYSQL_PREFIX?}_mod_reg` ORDER BY `id`', __FILE__, __LINE__);
 	// Close the cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]