Rewritten all THEME_FOO variables to GLOBALS

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index cd6d4ce3a2ce49e4c7f971c0cda33c09b469e418..640dd0b1f3be961dbb33a192acc9fce490a73659 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -63,7 +63,7 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
                        // And save all data in array
                        LOAD_INC($INC);
                        $themesArray['theme_unix'][] = $content['theme_path'];
-                       $themesArray['theme_name'][] = $THEME_NAME;
+                       $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
                } // END - if
        } // END - while
 
@@ -212,8 +212,8 @@ if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBAL
 
        // Remove current from array and set new
        $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);
-       unset($INC_POOL[array_search($theme, $INC_POOL)]);
-       $INC_POOL[] = sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme);
+       REMOVE_INC_FROM_POOL($theme);
+       ADD_INC_TO_POOL(sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme));
 } // END - if
 
 //