webmcp

changeset 452:122271e0118e

Fixed behavior of encode.url{...} when mixing "external" and "params" arguments
author jbe
date Thu Jul 21 19:12:08 2016 +0200 (2016-07-21)
parents 32b79658e5ae
children 1b380a0ab940
files framework/env/encode/url.lua
line diff
     1.1 --- a/framework/env/encode/url.lua	Thu Jul 21 13:01:34 2016 +0200
     1.2 +++ b/framework/env/encode/url.lua	Thu Jul 21 19:12:08 2016 +0200
     1.3 @@ -78,7 +78,11 @@
     1.4      end
     1.5    end
     1.6    if next(params) ~= nil or (id and id_as_param) then
     1.7 -    add("?")
     1.8 +    if not (external and string.find(external, "%?")) then
     1.9 +      add("?")
    1.10 +    else if external and not string.find(external, "&$") then
    1.11 +      add("&")
    1.12 +    end
    1.13      if id and id_as_param then
    1.14        add("_webmcp_id=", encode.url_part(id), "&")
    1.15      end

Impressum / About Us