# HG changeset patch
# User jbe
# Date 1469121128 -7200
# Node ID 122271e0118e18d4a0f1bb2ec027c4c660c8f1b1
# Parent  32b79658e5ae76768cfb4763e1f560fde39c07d8
Fixed behavior of encode.url{...} when mixing "external" and "params" arguments

diff -r 32b79658e5ae -r 122271e0118e framework/env/encode/url.lua
--- a/framework/env/encode/url.lua	Thu Jul 21 13:01:34 2016 +0200
+++ b/framework/env/encode/url.lua	Thu Jul 21 19:12:08 2016 +0200
@@ -78,7 +78,11 @@
     end
   end
   if next(params) ~= nil or (id and id_as_param) then
-    add("?")
+    if not (external and string.find(external, "%?")) then
+      add("?")
+    else if external and not string.find(external, "&$") then
+      add("&")
+    end
     if id and id_as_param then
       add("_webmcp_id=", encode.url_part(id), "&")
     end