X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_edit.php;h=8dbbaeb6923cf5cb5aaaec2ba1ff1db7dc9add27;hb=258bb8c82f21617f7f90bff8023602a11b986f7e;hp=da8e61225e716bde5a7a75eeef389070666c79ee;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index da8e61225e..8dbbaeb692 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -50,9 +50,7 @@ if (!isExtensionActive('theme')) {
 } // END - if
 
 // Check for selected themes
-$SEL = 0;
-if (isPostRequestElementSet('sel')) $SEL = countPostSelection();
-if ($SEL > 0) {
+if (countPostSelection() > 0) {
 	$OUT = '';
 	foreach (postRequestElement('sel') as $id => $sel) {
 		$sql = '';
@@ -79,11 +77,11 @@ if ($SEL > 0) {
 			// Rebuild cache
 			rebuildCacheFile('themes', 'them');
 		} // END - if
-	}
+	} // END - foreach
 
 	// Output generated?
 	if (empty($OUT)) $OUT = getMessage('ADMIN_THEME_NO_OUTPUT');
-} elseif (isGetRequestElementSet(('default_theme'))) {
+} elseif (isGetRequestElementSet('default_theme')) {
 	// Escape string from input
 	$postData['default_theme'] = getRequestElement('default_theme');
 
@@ -91,20 +89,32 @@ if ($SEL > 0) {
 	setTheme($postData['default_theme']);
 
 	// Set it in config and current theme as well
-	$GLOBALS['curr_theme'] = $postData['default_theme'];
 	setConfigEntry('default_theme', $postData['default_theme']);
 
 	// Save theme
 	adminSaveSettings($postData);
 }
 
+// Init rows
+$OUT = ''; 
+
 // Switch to testing mode
 $GLOBALS['theme_mode'] = 'test';
 
-// Generate output lines for the template
-$OUT = ''; $SW = 2;
-$result = SQL_QUERY("SELECT `id`, `theme_path`, `theme_active`, `theme_ver`, `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY theme_path", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT
+	`id`,
+	`theme_path`,
+	`theme_active`,
+	`theme_ver`,
+	`theme_name`
+FROM
+	`{?_MYSQL_PREFIX?}_themes`
+ORDER BY
+	`theme_path` ASC", __FILE__, __LINE__);
+
 if (SQL_NUMROWS($result) > 0) {
+	// Init color
+	$SW = 2;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Construct IFN
 		$inc = sprintf("theme/%s/theme.php", $content['theme_path']);
@@ -133,7 +143,7 @@ if (SQL_NUMROWS($result) > 0) {
 		// Load row template and switch color
 		$OUT .= loadTemplate('admin_theme_edit_row', true, $content);
 		$SW = 3 - $SW;
-	}
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);