All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 61b32431eb70db851ccbce21dd3ed178810e5b67..6289a3d5611ba6383827760dce749a1ca250e4b5 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -53,10 +53,10 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
        // Load all themes
        while (list($theme) = SQL_FETCHROW($result)) {
                // Load it's theme.php file
-               $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme));
+               $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($theme));
                if (FILE_READABLE($INC)) {
                        // And save all data in array
-                       require($INC);
+                       LOAD_INC($INC);
                        $THEMES['theme_unix'][] = $theme;
                        $THEMES['theme_name'][] = $THEME_NAME;
                } // END - if
@@ -208,9 +208,9 @@ if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
        set_session('mxchange_theme', $newTheme);
 
        // Remove current from array and set new
-       $theme = sprintf("%stheme/%s/theme.php", PATH, $currTheme);
+       $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $currTheme);
        unset($INC_POOL[array_search($theme, $INC_POOL)]);
-       $INC_POOL[] = sprintf("%stheme/%s/theme.php", PATH, $newTheme);
+       $INC_POOL[] = sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme);
 } // END - if
 
 //