From c80902b65d816625a9723fb0a64a5380455c9726 Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Sun, 12 Feb 2006 18:00:56 +0000
Subject: [PATCH] merging 6.8 bugfixes

---
 docs/changelog/6.x.x.txt                                 | 6 ++++++
 .../tiny_mce/plugins/insertImage/insertImage.html        | 9 +++++++--
 .../jscripts/tiny_mce/plugins/pagetree/editor_plugin.js  | 7 +++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 9f942f9c4..9ca4f1242 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -43,6 +43,12 @@
  - fix [ 1429349 ] Invalid HTML returned by func=manageAssets
  - fix [ 1429348 ] Textboxes need to filter CR/LF
  - fix [ 1428481 ] WebGUI::HTTP::setFilename not working correctly in 6.8.5
+ - fix [ 1423608 ] Bug in Data Form in v6.8.5
+ - fix [ 1423324 ] Delete locked asset
+ - fix [ 1415743 ] Collab reply count includes old versions
+ - fix [ 1429299 ] RTE Collateral Functions Break when Prev Proxy Cache On
+ - fixed a bug where uploaded files would give an Auth Required regardless of
+   the user being in the view group or not (Martin Kamerbeek / Procolix)
 
 6.8.5
  - fix [ 1396957 ] Insufficient privileges check on the DataForm
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
index 9886f40ec..543922e7b 100644
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
@@ -31,8 +31,13 @@ function Init() {
     if(document.getElementById("dpicheck")) {
         dpi = document.getElementById("dpicheck").width;
     }
-    document.getElementById("lister").src = pageURL + '?op=richEditImageTree&DPI=' + dpi;
-    document.getElementById("viewer").src = pageURL + '?op=richEditViewThumbnail&DPI=' + dpi;
+    
+    //Check for proper get delimiter
+    var seperator = '';
+    if (pageURL.match(/\?/)) { seperator = ';' } else { seperator = '?'}
+    
+    document.getElementById("lister").src = pageURL + seperator + 'op=richEditImageTree&DPI=' + dpi;
+    document.getElementById("viewer").src = pageURL + seperator + 'op=richEditViewThumbnail&DPI=' + dpi;
 
     var txtFileName = document.getElementById("txtFileName");
 		
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
index 4e43c7062..e0121bfdd 100755
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
@@ -22,8 +22,11 @@ function TinyMCE_pagetree_execCommand(editor_id, element, command, user_interfac
 			var template = new Array();
 						
 			//alert(getWebguiProperty("pageURL"));
-
-			template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + '?op=richEditPageTree';
+			
+			//Check for proper get delimiter
+			var seperator = '';
+			if (getWebguiProperty ("pageURL").match(/\?/)) { seperator = ';' } else { seperator = '?'}
+			template['file'] = "../../../../../.." + getWebguiProperty ("pageURL") + seperator + 'op=richEditPageTree';
 			
 		//	alert(template['file']);
 			template['width'] = 500;