X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-themes.php;h=543fe3f1671862cd77cd2b6a21efbe87cdacf9c2;hp=e0e3a0768d255a662ce0b99c0777e04df9cf244f;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index e0e3a0768d..543fe3f167 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -36,17 +36,14 @@ 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(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "theme");
 	return;
 }
 
-// Already loaded?
-if (defined('__THEME_SELECTION_CONTENT')) return false;
-
 // Load all active designs (or all if admin)
 $whereStatement = ""; $OUT = "";
 if (!IS_ADMIN()) $whereStatement = " WHERE theme_active='Y'";
-$result_themes = SQL_QUERY("SELECT theme_path FROM `"._MYSQL_PREFIX."_themes`".$whereStatement, __FILE__, __LINE__);
+$result_themes = SQL_QUERY("SELECT theme_path FROM `{!_MYSQL_PREFIX!}_themes`".$whereStatement, __FILE__, __LINE__);
 $num_themes = SQL_NUMROWS($result_themes);
 
 if ($num_themes > 1) {
@@ -60,17 +57,14 @@ if ($num_themes > 1) {
 	$OUT = LOAD_TEMPLATE("theme_one", true);
 } elseif (IS_ADMIN()) {
 	// If there is no theme installed and there's an admin notify him!
-	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</div>");
+	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
 }
 
-// Remember
-define('__THEME_SELECTION_CONTENT', $OUT);
-
 // Free memory
 SQL_FREERESULT($result_themes);
 
 // Load final box template
-LOAD_TEMPLATE("theme_select_box");
+LOAD_TEMPLATE("theme_select_box", false, $OUT);
 
 //
 ?>