Module:Redirect - Revision history

Rickyboy320: 43 revisions imported: Imported Category TOC from wikipedia

2017-08-11T17:56:42Z

43 revisions imported: Imported Category TOC from wikipedia

Nyttend: Copying change per request of AlexTheWhovian. Please revert me if this causes some sort of error

2017-04-03T01:02:46Z

Copying change per request of AlexTheWhovian. Please revert me if this causes some sort of error

Jackmcbarn: handle redirects that pipe their link

2015-07-27T14:42:37Z

handle redirects that pipe their link

SiBr4: Moved from sandbox: making the isRedirect function available from other modules, like the main function is

2015-07-12T14:45:11Z

Moved from sandbox: making the isRedirect function available from other modules, like the main function is

Jackmcbarn: add p.getTargetFromText

2014-06-20T20:53:10Z

add p.getTargetFromText

Mr. Stradivarius: Changed protection level of Module:Redirect: High-risk Lua module: allow template editors ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

2014-06-11T05:38:57Z

Changed protection level of Module:Redirect: High-risk Lua module: allow template editors ([Edit=Allow only template editors and admins] (indefinite) [Move=Allow only template editors and admins] (indefinite))

Mr. Stradivarius: add getTarget and isRedirect functions, format comments

2014-06-11T05:11:12Z

add getTarget and isRedirect functions, format comments

Show changes

Mr. Stradivarius: handle apostrophes and other characters escaped by {{TALKPAGENAME}}, per protected edit request by User:Jackmcbarn

2014-04-16T06:25:28Z

handle apostrophes and other characters escaped by {{TALKPAGENAME}}, per protected edit request by User:Jackmcbarn

Mr. Stradivarius: extend the pattern to match a colon after the "REDIRECT" text

2013-09-24T13:22:29Z

extend the pattern to match a colon after the "REDIRECT" text

Mr. Stradivarius: Suppress errors on non-existent pages - was causing an error to appear on MediaWiki:Protectedpagetext in some cases. Also use pcall for mw.title.new, and a few other tweaks.

2013-07-24T10:52:24Z

Suppress errors on non-existent pages - was causing an error to appear on MediaWiki:Protectedpagetext in some cases. Also use pcall for mw.title.new, and a few other tweaks.

@@ Line 28: / Line 28: @@
 -- Gets the target of a redirect. If the page specified is not a redirect,
 -- returns nil.
-function p.getTarget(page)
+function p.getTarget(page, fulltext)
 	-- Get the title object. Both page names and title objects are allowed
 	-- as input.
@@ Line 52: / Line 52: @@
 		local targetTitle = getTitle(target)
 		if targetTitle then
-			return targetTitle.prefixedText
+			if fulltext then
 		else
 			return nil
@@ Line 61: / Line 65: @@
 		error(string.format(
 			'could not parse redirect on page "%s"',
-			titleObj.prefixedText
+			fulltext and titleObj.fullText or titleObj.prefixedText
 		))
 	end
@@ Line 75: / Line 79: @@
 -- target cannot be determined for some reason.
 --]]
-function p.luaMain(rname, bracket)
+function p.luaMain(rname, bracket, fulltext)
 	if type(rname) ~= "string" or not rname:find("%S") then
 		return nil
@@ Line 81: / Line 85: @@
 	bracket = bracket and "[[%s]]" or "%s"
 	rname = rname:match("%[%[(.+)%]%]") or rname
-	local target = p.getTarget(rname)
+	local target = p.getTarget(rname, fulltext)
 	local ret = target or rname
 	ret = getTitle(ret)
 	if ret then
-		ret = ret.prefixedText
+		if fulltext then
 		return bracket:format(ret)
 	else
@@ Line 95: / Line 103: @@
 function p.main(frame)
 	local args = require('Module:Arguments').getArgs(frame, {frameOnly = true})
-	return p.luaMain(args[1], args.bracket) or ''
+	return p.luaMain(args[1], args.bracket, args.fulltext) or ''
 end

@@ Line 19: / Line 19: @@
 	return string.match(
 		text,
-		"^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*:?%s*%[%[([^%[%]]-)%]%]"
+		"^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*:?%s*%[%[([^%[%]|]-)%]%]"
+	)
 end

@@ Line 95: / Line 95: @@
 end
--- Returns "yes" if the specified page is a redirect, and the blank string
+-- Returns true if the specified page is a redirect, and false otherwise.
--- otherwise.
+function p.luaIsRedirect(page)
-function p.isRedirect(frame)
+	local titleObj = getTitle(page)
 	if not titleObj then
-		return ''
+		return false
 	end
 	if titleObj.isRedirect then
 		return 'yes'
 	else

@@ Line 12: / Line 12: @@
 		return nil
 	end
 end
@@ Line 36: / Line 45: @@
 	-- Find the target by using string matching on the page content.
-	local target = string.match(
+	local target = p.getTargetFromText(titleObj:getContent() or "")
 	if target then
 		local targetTitle = getTitle(target)

@@ Line 41: / Line 41: @@
      -- in case we are over the expensive function count limit.
      local noError, rpage = pcall(mw.title.new, rname)
-     if not noError or noError and not rpage or not rpage.isRedirect then
+     if not noError or not rpage then
-        -- mw.title.new failed, or the page is not a redirect, so use the passed page name.
+    	-- mw.title.new failed, so use the passed page name.
-         return mw.ustring.format(bracket, rname)
+    	return mw.ustring.format(bracket, rname)
      end

← Older revision	Revision as of 17:56, 11 August 2017
(No difference)

← Older revision	Revision as of 05:38, 11 June 2014
(No difference)

@@ Line 46: / Line 46: @@
      end
-     local redirect = mw.ustring.match(rpage:getContent() or "", "^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*%[%[([^%[%]]-)%]%]" )
+     local redirect = mw.ustring.match(rpage:getContent() or "", "^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*:?%s*%[%[([^%[%]]-)%]%]" )
      if redirect then
          -- Decode html entities and percent encodings.

@@ Line 7: / Line 7: @@
 -- [[{{#invoke:redirect|main|redirect-page-name}}]] and {{#invoke:redirect|main|redirect-page-name|bracket=yes}}
-p={}
+local p = {}
 function p.main(frame)
-     local args, pargs = frame.args, (frame:getParent() or {}).args or {}
+     -- If called via #invoke, use the args passed into the invoking
-     local rname, bracket = args[1] or pargs[1], args.bracket or pargs.bracket
+    -- template, or the args passed to #invoke if any exist. Otherwise
-     if not rname or not mw.ustring.match(rname, "%S") then return "" end
+     if type(rname) ~= "string" or not mw.ustring.match(rname, "%S") then return end
      bracket = bracket and "[[%s]]" or "%s"
-     rname = mw.ustring.match(rname,"%[%[(.+)%]%]") or rname
+     rname = mw.ustring.match(rname, "%[%[(.+)%]%]") or rname
-     local rpage, err = mw.title.new(rname)
+    -- Get the title object, passing the function through pcall
+    -- in case we are over the expensive function count limit.
-    -- avoid expensive operation when nothing to do
+     local noError, rpage = pcall(mw.title.new, rname)
-     if not rpage then
+     if not noError or noError and not rpage or not rpage.isRedirect then
-         err = "File not found (mw.title.new failed)"
+         -- mw.title.new failed, or the page is not a redirect, so use the passed page name.
-     elseif rpage.id == 0 then
+        return mw.ustring.format(bracket, rname)
-         err = "File not found (id=0):"
+    end
-    elseif not rpage.isRedirect then
-         return mw.ustring.format(bracket, rname) -- not a redirect so use passed page name (for some general-purpose template use)
+    local redirect = mw.ustring.match(rpage:getContent() or "", "^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*%[%[([^%[%]]-)%]%]" )
      else
-         local redirect = mw.ustring.match( rpage:getContent() or "", "^#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*%[%[(.-)%]%]" )
+         return mw.ustring.format('<span class="error">[[Module:redirect]] error: could not parse redirect - [[%s]]</span>', rname)
      end
 end
 return p