X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Faction-themes.php;h=543fe3f1671862cd77cd2b6a21efbe87cdacf9c2;hb=d26e8ed6303691be6c5a0eff216494bdd6cfbe8d;hp=522158d0abdc066b42138bcbd9ceb569fea2610c;hpb=939bce138060b727dc96764df88fbb8e4e7049c7;p=mailer.git

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 522158d0ab..543fe3f167 100644
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -35,18 +35,15 @@
 if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-} elseif (!EXT_IS_ACTIVE("theme")) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+} elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
+	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, "<FONT class=\"admin_note\">".ADMIN_NO_THEME_INSTALLED_WARNING."</FONT>");
+	$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);
 
 //
 ?>