X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-themes.php;h=52e22c9fd9967b6b13d18b63ba9ec9eb1e2b87a4;hp=6b3118598508712cdb521df6d5c0ee6fe75069dd;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 6b31185985..52e22c9fd9 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/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 ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
 	return;
 }
 
@@ -54,8 +54,8 @@ $num_themes = SQL_NUMROWS($result_themes);
 if ($num_themes > 1) {
 	// If more than 1 is installed output selection box
 	$act = '';
-	if (!empty($GLOBALS['action'])) $act = SQL_ESCAPE($GLOBALS['action']);
-	$OUT = generateThemeSelectionBox('index', $act, $GLOBALS['what'], $result_themes);
+	if (isActionSet()) $act = getAction();
+	$OUT = generateThemeSelectionBox('index', $act, getWhat(), $result_themes);
 } elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
 	// If there's only one just print it's name
 	define('__THEME_NAME', getCurrentThemeName());