From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 29 Dec 2010 22:57:16 +0000 (+0000)
Subject: Bugfix for javascript upload OSQA-487
X-Git-Tag: live~479
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/7395cbba715aeda5b5d0927f33d4949b05803865

Bugfix for javascript upload OSQA-487

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@655 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/media/js/wmd/showdown.js b/forum/skins/default/media/js/wmd/showdown.js
index 0efa6c5..330550d 100644
--- a/forum/skins/default/media/js/wmd/showdown.js
+++ b/forum/skins/default/media/js/wmd/showdown.js
@@ -634,7 +634,9 @@ var writeImageTag = function(wholeMatch,m1,m2,m3,m4,m5,m6,m7) {
 	
 	alt_text = alt_text.replace(/"/g,"&quot;");
 	url = escapeCharacters(url,"*_");
+	url = scriptUrl + url
 	var result = "<img src=\"" + url + "\" alt=\"" + alt_text + "\"";
+	result = result.replace("//", "/")
 
 	// attacklab: Markdown.pl adds empty title attributes to images.
 	// Replicate this bug.
diff --git a/forum/skins/default/media/js/wmd/wmd.js b/forum/skins/default/media/js/wmd/wmd.js
index b6d0e43..f541581 100644
--- a/forum/skins/default/media/js/wmd/wmd.js
+++ b/forum/skins/default/media/js/wmd/wmd.js
@@ -17,7 +17,7 @@ function ajaxFileUpload(imageUrl)
       $.ajaxFileUpload
       (
         {
-            url:'/upload/',
+            url: scriptUrl+'upload/',
               secureuri:false,
               fileElementId:'file-upload',
               dataType: 'xml',