From 583c71d06e03210fa4735c0f0e4311f707b3914f Mon Sep 17 00:00:00 2001
From: mrpete <mrpete@e107.org>
Date: Thu, 7 Dec 2006 12:57:43 +0000
Subject: [PATCH] Bugfix #3568 - wysiwyg was not being tested for properly. in
 content, removed old wysiwyg detection and js download code.

---
 e107_plugins/content/content_manager.php | 16 +++-------------
 e107_plugins/content/content_submit.php  | 20 +++-----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/e107_plugins/content/content_manager.php b/e107_plugins/content/content_manager.php
index ec09281b1..9ba9725bb 100644
--- a/e107_plugins/content/content_manager.php
+++ b/e107_plugins/content/content_manager.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/content_manager.php,v $
-|		$Revision: 1.1.1.1 $
-|		$Date: 2006-12-02 04:34:54 $
-|		$Author: mcfly_e107 $
+|		$Revision: 1.2 $
+|		$Date: 2006-12-07 12:57:43 $
+|		$Author: mrpete $
 +---------------------------------------------------------------+
 */
 
@@ -65,20 +65,10 @@ if(isset($_POST['delete'])){
 
 //these have to be set for the tinymce wysiwyg
 $e_wysiwyg	= "content_text";
-//if(check_class($pref['post_html']) && $pref['wysiwyg'] && $e_wysiwyg == TRUE){
-if($pref['wysiwyg'] && $e_wysiwyg == TRUE){
-	require_once(e_HANDLER."tiny_mce/wysiwyg.php");
-	define("e_WYSIWYG",TRUE);
-	$tiny = wysiwyg($e_wysiwyg);
-}else{
-	define("e_WYSIWYG",FALSE);
-}
 
 //include js
 function headerjs(){
-	global $tiny;
 	echo "<script type='text/javascript' src='".e_FILE."popup.js'></script>\n";
-	echo $tiny;
 }
 // ##### DB ---------------------------------------------------------------------------------------
 
diff --git a/e107_plugins/content/content_submit.php b/e107_plugins/content/content_submit.php
index e9611af3a..b05d88556 100644
--- a/e107_plugins/content/content_submit.php
+++ b/e107_plugins/content/content_submit.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/content_submit.php,v $
-|		$Revision: 1.1.1.1 $
-|		$Date: 2006-12-02 04:34:55 $
-|		$Author: mcfly_e107 $
+|		$Revision: 1.2 $
+|		$Date: 2006-12-07 12:57:43 $
+|		$Author: mrpete $
 +---------------------------------------------------------------+
 */
 
@@ -39,20 +39,6 @@ $eArrayStorage = new ArrayData();
 
 //these have to be set for the tinymce wysiwyg
 $e_wysiwyg	= "content_text";
-if(check_class($pref['post_html']) && $pref['wysiwyg'] && $e_wysiwyg == TRUE){
-	require_once(e_HANDLER."tiny_mce/wysiwyg.php");
-	define("e_WYSIWYG",TRUE);
-	$tiny = wysiwyg($e_wysiwyg);
-}else{
-	define("e_WYSIWYG",FALSE);
-}
-
-//include js
-function headerjs(){
-	global $tiny;
-	echo $tiny;
-}
-
 global $tp;
 
 $lan_file = $plugindir.'languages/'.e_LANGUAGE.'/lan_content.php';