More fixes for new installer and script in general :(

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

diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php
index 7507530122b0e9be4134a3c46a50a4731c3d6e1a..3613f7232db82ea4d61665d4667d67f72218664c 100644 (file)
--- a/inc/loader/load-themes.php
+++ b/inc/loader/load-themes.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isExtensionActive('theme')) {
        // Skip this loader
-       return false;
+       return FALSE;
 }
 
 // Next cached table are the themes
@@ -70,15 +70,15 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
        // Remove dummy array
        unset($cache);
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();
 
        // 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` ASC', __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` ASC', __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