Merge Branch2015.2 patches

svn path=/Website/trunk/; revision=27122
2015-11-25 16:10:32 +00:00
parent 1cc5464648
commit aa4e8c3ea2
11 changed files with 32 additions and 13 deletions
--- a/APPL/API/shorturl.asp
+++ b/APPL/API/shorturl.asp
@@ -59,6 +59,13 @@
        else
            url = known_bookmarks[u].mob || known_bookmarks[u].gui;
        url = rooturl + "/" + url + keyparam;
+
+        if (keyparam > -1)
+        {
+            rest = rest.substring(("k="+keyparam).length+1);
+        }
+        if (rest)
+            url += "&" + rest;
    }
    else
    {