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 ef2d07b3aa8ded9b112433b37b9b0b09fb72911d..895ef86bf2798cc96181b411beb4c58c6582b122 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -122,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');
@@ -242,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'));