From 702ce6e9f410cee4781fd0c4747e452f036de111 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Mon, 26 Oct 2009 10:55:46 +0000
Subject: [PATCH] Some notice removal

---
 e107_handlers/e_parse_class.php  |  6 +++---
 e107_plugins/tinymce/wysiwyg.php | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 2966c92f0..f95ecd934 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -9,8 +9,8 @@
 * Text processing and parsing functions
 *
 * $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
-* $Revision: 1.67 $
-* $Date: 2009-10-22 13:00:10 $
+* $Revision: 1.68 $
+* $Date: 2009-10-26 10:55:39 $
 * $Author: e107coders $
 *
 */
@@ -1352,7 +1352,7 @@ class e_parse
 					'{e_PLUGIN}'	=> e_PLUGIN_ABS,
 					'{e_FILE}'		=> e_FILE_ABS,
 					'{e_THEME}'		=> e_THEME_ABS,
-					'{e_DOWNLOAD}'	=> e_DOWNLOAD_ABS,
+					'{e_DOWNLOAD}'	=> e_BASE.'request.php?',
 					'{e_ADMIN}'		=> e_ADMIN_ABS,
 					'{e_HANDLER}'	=> e_HANDLER_ABS
 				);
diff --git a/e107_plugins/tinymce/wysiwyg.php b/e107_plugins/tinymce/wysiwyg.php
index b1f62f59f..778fe60db 100644
--- a/e107_plugins/tinymce/wysiwyg.php
+++ b/e107_plugins/tinymce/wysiwyg.php
@@ -4,8 +4,8 @@
 |     e107 website system - Tiny MCE controller file.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/wysiwyg.php,v $
-|     $Revision: 1.17 $
-|     $Date: 2009-10-12 06:38:01 $
+|     $Revision: 1.18 $
+|     $Date: 2009-10-26 10:55:46 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -176,7 +176,7 @@ class wysiwyg
 	
 	function tinyMce_config()
 	{
-		$text .= "
+		$text = "
 			
 	function start_tinyMce()
 	{
@@ -188,7 +188,7 @@ class wysiwyg
 		{
 			$text .= "\t\t  ".$key." : '".$val."',\n";
 		}
-	
+	/*
 		if($tinyMcePrefs['customjs'])
 		{
 			$text .= "\n,
@@ -202,7 +202,7 @@ class wysiwyg
 			";
 		
 		}
-	
+	*/
 		$text .= "
 		});
 		
@@ -280,6 +280,7 @@ class wysiwyg
 			$this->config['cleanup_callback'] = 'tinymce_html_bbcode_control';		
 		}
 		
+		$paste_plugin = (strpos($config['tinymce_plugins'],'paste')!==FALSE) ? TRUE : FALSE;
 		
 		if($paste_plugin)
 		{