More rewrites to make use of (cached) wrapper functions

[mailer.git] / inc / libs / theme_functions.php

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 2279e5741fdfb5adf53b55b50b095872f7bb9b80..895ef86bf2798cc96181b411beb4c58c6582b122 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -92,11 +92,12 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Construct selection form for the box template
+       // @TODO Can't this be rewritten to an API function?
        $OUT = '';
        foreach ($themesArray['theme_unix'] as $key => $theme) {
-               $OUT .= "  <option value=\"".$theme."\"";
+               $OUT .= '  <option value="' . $theme . '"';
                if ($theme == getCurrentTheme()) $OUT .= ' selected="selected"';
-               $OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
+               $OUT .= '>' . $themesArray['theme_name'][$key] . '</option>';
        } // END - foreach
 
        // Remember content
@@ -121,9 +122,9 @@ function getThemeVersion ($name) {
        $cver = '?.?';
 
        // Is the cache entry there?
-       if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
+       if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) {
                // Get the version from cache
-               $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
+               $cver = $GLOBALS['cache_array']['themes']['theme_version'][$name];
 
                // Count up
                incrementStatsEntry('cache_hits');
@@ -241,7 +242,7 @@ function getActualTheme () {
                        // Fix it to default
                        $ret = 'default';
                } // END - if
-       } elseif ((!isInstalled()) && ((isInstalling()) || (getOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+       } elseif ((!isInstalled()) && ((isInstalling()) || (getScriptOutputMode() == true)) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
                // Prepare filename for checking
                $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));