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 p._urlextractUrl(url, textargs) url = mw.text.trim for name, val in pairs(url or '') text = mw.text.trim(text or ''args)do if url == '' then if text =name ~= '' then return mw.getCurrentFrame():expandTemplate{ title 2 and name ~= 'tlx', args = { 'URL', "''example.com''", msg"''optional display text''" } }then 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. local url = mwname .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, '#$', '')val; 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') 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' -- Handle URLs from Wikidata 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 format http&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, '#58;//$', '') 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') 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 returns no message by default.It strips out wiki-link markup, html tags, and everything after a space.--]]function extractUrlp.url2(frame) local templateArgs = frame.args) for name, val in pairslocal parentArgs = frame:getParent().args) do local url = name templateArgs[1] or parentArgs[1] local text = templateArgs[2] or parentArgs[2] or '' -- default to no message local msg = templateArgs.msg or parentArgs. "msg or 'no' url =" url or extractUrl(templateArgs) or extractUrl(parentArgs) or '' -- if the url came from a Wikidata call, it might have a pen icon appended -- we want to keep that and add it back at the end.. val; url local u1, penicon = mw.ustring.gsubmatch(url, "(.*)(&nbsp;<span class='^penicon.*)" ) if penicon then url = u1 end -- strip out html tags and [Hh][Tt][Tt][Pp]from url url = ([Ss]?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) or "") .. (penicon or "")