「モジュール:Redirect」の版間の差分

モジュール:Redirect (ソースを閲覧)

2021年9月10日 (金) 16:46時点における版

394 バイト除去、 2021年9月10日 (金)

restore p.getTargetFromText which is used by Module:RfD which is causing "Lua error in Module:RfD at line 87: attempt to call upvalue 'getTargetFromText' (a nil value)"

匿名利用者

bsd>Johnuniq

@@ 17行目: / 17行目: @@
 -- redirect.
 function p.getTargetFromText(text)
-	return string.match(
+	local target = string.match(
 		text,
 		"^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*:?%s*%[%[([^%[%]|]-)%]%]"
@@ 24行目: / 24行目: @@
 		"^%s*#[Rr][Ee][Dd][Ii][Rr][Ee][Cc][Tt]%s*:?%s*%[%[([^%[%]|]-)|[^%[%]]-%]%]"
 	)
+	return target and mw.uri.decode(target, 'PATH')
 end
@@ 43行目: / 44行目: @@
 		), 2)
 	end
-	if not titleObj or not titleObj.isRedirect then
+	if not titleObj then
 		return nil
 	end
+	local targetTitle = titleObj.redirectTarget
-	-- Find the target by using string matching on the page content.
+	if targetTitle then
-	local target = p.getTargetFromText(titleObj:getContent() or "")
+		if fulltext then
-	if target then
+			return targetTitle.fullText
-		local targetTitle = getTitle(target)
-		if targetTitle then
-			if fulltext then
-				return targetTitle.fullText
-			else
-				return targetTitle.prefixedText
-			end
 		else
-			return nil
+			return targetTitle.prefixedText
 		end
 	else
-		-- The page is a redirect, but matching failed. This indicates a bug in
+		return nil
-		-- the redirect matching pattern, so throw an error.
-		error(string.format(
-			'could not parse redirect on page "%s"',
-			fulltext and titleObj.fullText or titleObj.prefixedText
-		))
 	end
 end
@@ 74行目: / 63行目: @@
 -- target page name, or the passed page name when not a redirect. The passed
 -- page name can be given as plain text or as a page link.
 --
 -- Returns page name as plain text, or when the bracket parameter is given, as a
 -- page link. Returns an error message when page does not exist or the redirect