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 0efa6c5ecd93b14318ff292c434abf9e902e35ac..330550d34913d139e2318a76993c78f1c928efd2 100644 (file)
--- 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,""");
        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 b6d0e434173c6fc25717de009ce7aae3c3157e17..f54158185726291aa831b72f887845baddab1fc3 100644 (file)
--- 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',