From b14a31df395c370f87c492356ec8216a24f31beb Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Sat, 5 May 2012 02:15:51 +0000
Subject: [PATCH] TinyMce e107Bbcode fixes

---
 e107_admin/image.php                               | 10 ++++++----
 e107_plugins/tinymce/plugins/ibrowser/ibrowser.php | 10 ----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/e107_admin/image.php b/e107_admin/image.php
index 370de5fe4..6c8b2ba77 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -544,7 +544,7 @@ class media_admin_ui extends e_admin_ui
 			{
 				var style 			= '';
 				var bb 				= '';
-				
+							
 				var src				= document.getElementById('src').value;	
 				var width 			= document.getElementById('width').value;	
 				var height			= document.getElementById('height').value;			
@@ -555,12 +555,12 @@ class media_admin_ui extends e_admin_ui
 						
 				if(width !='')
 				{				
-					style  = style + 'width:' + width + 'px;';	
+			//		style  = style + 'width:' + width + 'px;';	
 				}
 
 				if(height !='')
 				{				
-					style  = style + 'height:' + height + 'px;';	
+			//		style  = style + 'height:' + height + 'px;';	
 				}				
 							
 				if(margin_right !='')
@@ -596,7 +596,9 @@ class media_admin_ui extends e_admin_ui
 				
 				document.getElementById('bbcode_holder').value = bb;
 				
-				var html = '<img style=\"' + style + '\" src=\"'+ src +'\" />'; 
+			//	var html = '<img style=\"' + style + '\" src=\"'+ src +'\" />'; 
+				var html = '<img style=\"' + style + '\" src=\"'+ src +'\" alt=\"\" width=\"' + width + '\" height=\"' + height + '\"/>'; 
+
 				document.getElementById('html_holder').value = html;
 				
 			}	
diff --git a/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php b/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
index 8d861f00a..6a1f0029a 100644
--- a/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
+++ b/e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
@@ -25,16 +25,6 @@ require_once("../../../../class2.php");
 header("Location: ".e_ADMIN_ABS.'image.php?mode=main&action=dialog&for=news&tagid=news-thumbnail&iframe=1&bbcode=1');
 exit; 
 
-$_GET['iframe'] = 1;
-$_GET['mode'] = 'main';
-$_GET['action'] = 'dialog';
-$_GET['for'] = 'news';
-$_GET['tagid'] = 'news-thumbnail';
-$_GET['bbcode']= 1;
-
-// 
-require_once(e_ADMIN.'image.php');
-exit;
 
 if (!defined('e107_INIT')) { exit; }