From 791ef7d7763c3f3a0c357b8f17b80411810a991b Mon Sep 17 00:00:00 2001
From: mrpete <mrpete@e107.org>
Date: Thu, 7 Dec 2006 12:53:49 +0000
Subject: [PATCH] Bugfix #3568 - wysiwyg was not being tested for properly.
This has been an ongoing issue, now resolved. admin and user code need not
download wysiwyg js etc -- use e_WYSIWYG constant to see if it is enabled.
Also fixed minor popup bug in header/footer (two different issues)
---
e107_themes/templates/footer_default.php | 8 ++++----
e107_themes/templates/header_default.php | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/e107_themes/templates/footer_default.php b/e107_themes/templates/footer_default.php
index 4e5639a2a..9b0d7a911 100644
--- a/e107_themes/templates/footer_default.php
+++ b/e107_themes/templates/footer_default.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/footer_default.php,v $
-| $Revision: 1.2 $
-| $Date: 2006-12-05 09:33:20 $
+| $Revision: 1.3 $
+| $Date: 2006-12-07 12:53:49 $
| $Author: mrpete $
+----------------------------------------------------------------------------+
*/
@@ -107,6 +107,8 @@ if(varset($e107_popup)!=1){
echo "</table>";
}
+} // End of regular-page footer (the above NOT done for popups)
+
//
// D Close DB connection. We're done talking to underlying MySQL
//
@@ -123,8 +125,6 @@ if(varset($e107_popup)!=1){
$ns->tablerender('Quick Admin Timer',"Results: {$tmp} microseconds");
}
-} // End of regular-page footer (the above NOT done for popups)
-
if ($pref['developer']) {
global $oblev_at_start,$oblev_before_start;
if (ob_get_level() != $oblev_at_start) {
diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php
index 93e67596a..cb58efda0 100644
--- a/e107_themes/templates/header_default.php
+++ b/e107_themes/templates/header_default.php
@@ -6,8 +6,8 @@
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
-| $Revision: 1.2 $
-| $Date: 2006-12-05 09:33:20 $
+| $Revision: 1.3 $
+| $Date: 2006-12-07 12:53:49 $
| $Author: mrpete $
+-----------------------------------------------------------------------------------------------+
*/
@@ -90,7 +90,7 @@ echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? "
echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off.
-if (isset($WYSIWYG) && $WYSIWYG == TRUE && check_class($pref['post_html']) && isset($e_wysiwyg) && $e_wysiwyg != "") {
+if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
require_once(e_HANDLER."tiny_mce/wysiwyg.php");
define("e_WYSIWYG",TRUE);
echo wysiwyg($e_wysiwyg);