New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / modules / member / action-themes.php

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index c8d0c60f8dd7cc70f8be4bae53f4c9932a26d527..a0f61cac2684e218d2331cad0a83f4421a202841 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'theme'));
        return;
@@ -58,10 +58,10 @@ if ($num_themes > 1) {
        $act = ''; $wht = '';
        if (!empty($GLOBALS['action'])) $act = SQL_ESCAPE($GLOBALS['action']);
        if (!empty($GLOBALS['what']))   $wht = SQL_ESCAPE($GLOBALS['what']);
-       $OUT = THEME_SELECTION_BOX("login", $act, $wht, $result_themes);
+       $OUT = generateThemeSelectionBox("login", $act, $wht, $result_themes);
 } elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
        // If there's only one just print it's name
-       define('__THEME_NAME', GET_CURR_THEME_NAME());
+       define('__THEME_NAME', getCurrentThemeName());
        $OUT = LOAD_TEMPLATE("theme_one", true);
 } elseif (IS_ADMIN()) {
        // If there is no theme installed and there's an admin notify him!