Changes

-- See unit tests at [[Module:URL/teststestcases]]

local success, uri = pcall(function() return mw.uri.new(s) end) if success then return uri end

local function extractUrl(args) for name, val in pairs(args) do if name ~= 2 and name ~= "msg" then local url = name .. "=" .. val; url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?):(/?)([^/])', 'http%1://%3') local uri = safeUri(url); if uri and uri.host then return url end end endend function p._url(url, text, msg) url = mw.text.trim(url or '') text = mw.text.trim(text or '') local nomsg = (msg or ''):sub(1,1):lower() == "n" or msg == 'false' -- boolean: true if msg is "false" or starts with n or N if url == '' then if text == '' then if nomsg then return nil else return mw.getCurrentFrame():expandTemplate{ title = 'tlx', args = { 'URL', "''example.com''", "''optional display text''" } } end else return text end end -- If the URL contains any unencoded spaces, encode them, because MediaWiki will otherwise interpret a space as the end of the URL. url = mw.ustring.gsub(url, '%s', function(s) return mw.uri.encode(s, 'PATH') end) -- If there is an empty query string or fragment id, remove it as it will cause mw.uri.new to throw an error url = mw.ustring.gsub(url, '#$', '') url = mw.ustring.gsub(url, '%?$', '') -- If it's an HTTP[S] URL without the double slash, fix it. url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?):(/?)([^/])', 'http%1://%3')  -- Handle URLs from Wikidata of the format http:// url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?)://', 'http%1://')  local uri = safeUri(url)  -- Handle URL's without a protocol and URL's that are protocol-relative, -- e.g. www.example.com/foo or www.example.com:8080/foo, and //www.example.com/foo if uri and (not uri.protocol or (uri.protocol and not uri.host)) and url:sub(1, 2) ~= '//' then url = 'http://' .. url uri = safeUri(url) end  if text == '' then if uri then if uri.path == '/' then uri.path = '' end

-- Handle URLs from Wikidata of the format http:// url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?)://', 'http%1://') local uri = safeUri(url) -- Handle URL's without a protocol and URL's that are protocol-relative, -- e.g. www.example.com/foo or www.example.com:8080/foo, and //www.example.com/foo if uri and (not uri.protocol or (uri.protocol and not uri.host)) and url:sub(1, 2) ~= '//' then url = 'http://' .. url uri = safeUri(url) end if text == '' then if uri then if uri.path == '/' then uri.path = '' end local port = '' if uri.port then port = ':' .. uri.port end text = mw.ustring.lower(uri.host or '') .. port .. (uri.relativePath or '')

else -- URL is badly-formed, so just display whatever was passed in text = url end end

return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)

local templateArgs = frame.args local parentArgs = frame:getParent().args; local url = templateArgs[1] or parentArgs[1] or '' local text = templateArgs[2] or parentArgs[2]or '' if not text then local msg = templateArgs.msg or parentArgs.msg or '' url = url or extractUrl(templateArgs) or extractUrl(parentArgs); end text = text or '' return p._url(url, text, msg)

 --[[The entry point for calling from the forked Template:URL2.This function extractUrl(args)returns no message by default. for nameIt strips out wiki-link markup, html tags, val in pairsand everything after a space.--]]function p.url2(argsframe) do local url templateArgs = name frame.. "args local parentArgs =" frame:getParent().. val;args local url = mw.ustring.gsub(url, '^templateArgs[Hh1]or parentArgs[Tt1] local text = templateArgs[Tt2]or parentArgs[Pp2]or '' -- default to no message local msg = templateArgs.msg or parentArgs.msg or 'no' url = url or extractUrl(templateArgs) or extractUrl(parentArgs) or '' -- strip out html tags and [Ss]?from url url = (url or ''):gsub(/?)("<[^/>]*>", "")', 'http:gsub("[%1://[%3']]", "") local uri -- truncate anything after a space url = safeUriurl:gsub(url"%%20", " "); if uri and uri:gsub(" .host then*", "") return p._url(url end end, text, msg)