X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload-themes.php;h=c482fc53e8696524b9f96aebe9aca654f8df2e75;hb=74a607e3879faefdc2ca152605cb533806b98e83;hp=0deca53068072853d9d0a80176db761028065807;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php
index 0deca53068..c482fc53e8 100644
--- a/inc/loader/load-themes.php
+++ b/inc/loader/load-themes.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,17 +38,17 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} elseif (isInstallationPhase()) {
+	// Use this code if you don't want to run this cache loader on installation phase
+	return;
 } elseif (!isExtensionActive('theme')) {
 	// Skip this loader
-	return false;
+	return FALSE;
 }
 
-// Use this code if you don't want to run this cache loader on installation phase
-if (isInstallationPhase()) return;
-
-// Next cached table is the referal system (themes)...
+// Next cached table are the themes
 if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) {
-	// Load referal system from cache
+	// Load themes
 	$cache = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Restructure the array
@@ -76,9 +76,9 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
 	// Load all themes and their data
 	if (isExtensionInstalledAndNewer('theme', '0.0.7')) {
-		$result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT `id`, `theme_path`, `theme_active`, `theme_ver`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC', __FILE__, __LINE__);
 	} else {
-		$result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
+		$result = SQL_QUERY('SELECT `id`, `theme_path`, `theme_active`, `theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC', __FILE__, __LINE__);
 	}
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file