Several more constants rewritten to getConfig()

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index eb85579a286784abf03ecd8802fac91a85a2cb96..0c36ae43b923b614be3e21e303ebcc654730685f 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -52,7 +52,7 @@ function generateThemeSelectionBox () {
        } // END - if
 
        // Construction URL
-       $formAction = "{!URL!}/modules.php?module=" . $mod;
+       $formAction = "{?URL?}/modules.php?module=" . $mod;
        if (!empty($what)) $formAction .= "&what=" . $what;
 
        // Initialize array
@@ -227,10 +227,11 @@ if ((REQUEST_ISSET_POST('new_theme')) && (REQUEST_POST('new_theme') != $GLOBALS[
        // Change to new theme
        setSession('mxchange_theme', $newTheme);
 
-       // Remove current from array and set new
-       $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);
-       REMOVE_INC_FROM_POOL($theme);
-       ADD_INC_TO_POOL(sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme));
+       // Remove current from array
+       REMOVE_INC_FROM_POOL(sprintf("theme/%s/theme.php", $GLOBALS['curr_theme']));
+
+       // Add new theme
+       ADD_INC_TO_POOL(sprintf("theme/%s/theme.php", $newTheme));
 } // END - if
 
 // [EOF]