Inconsistency between echo and print() fixed to OUTPUT_HTML() (not all)

[mailer.git] / inc / modules / member / action-themes.php

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index 46acae9c4ecc6fe9072605a09780f7c64b7c97a0..b4cdecf9654432536bb1da1a6003f5b858873cf8 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -47,11 +47,14 @@ if (!defined('__SECURITY')) {
        return;
 }
 
-// Load all active designs (or all if admin)
-$whereStatement = ''; $OUT = '';
-if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";
-$result_themes = SQL_QUERY("SELECT theme_path FROM `{!_MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);
-$num_themes = SQL_NUMROWS($result_themes);
+// Get total num
+if (IS_ADMIN()) {
+       // Load only active designs for user
+       $num_themes = GET_TOTAL_DATA('Y', 'themes', 'id', 'theme_active', true);
+} else {
+       // Load all themes for admin
+       $num_themes = GET_TOTAL_DATA('', 'themes', 'id', '', true);
+}
 
 if ($num_themes > 1) {
        // If more than 1 is installed output selection box
@@ -60,7 +63,7 @@ if ($num_themes > 1) {
        if (isWhatSet())   $wht = getWhat();
        $OUT = generateThemeSelectionBox('login', $act, $wht, $result_themes);
 } elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
-       // If there's only one just print it's name
+       // If there's only one just output it's name
        define('__THEME_NAME', getCurrentThemeName());
        $OUT = LOAD_TEMPLATE('theme_one', true);
 } elseif (IS_ADMIN()) {