jenkins-bot has submitted this change and it was merged.
Change subject: Move log log_page entries are now that of the moved page
......................................................................
Move log log_page entries are now that of the moved page
bug: 57084
Change-Id: Ibc20d79093eedcdaba1873861e177ca3a6108bca
---
M RELEASE-NOTES-1.24
M includes/Title.php
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index c5b6cd4..bdf9a11 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -434,6 +434,8 @@
called unconditionally.
* TablePager::getBody() is now 'final' and can't be overridden in subclasses.
* TablePager::getBody() is deprecated, use getBodyOutput() or getFullOutput().
+* log_page for move log entries store the original page ID, rather than that
+ of the new redirect page. This is not retroactive.
==== Renamed classes ====
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/Title.php b/includes/Title.php
index 7fdeb05..ca292ee 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3931,9 +3931,13 @@
$redirectContent = null;
}
+ // bug 57084: log_page should be the ID of the *moved* page
+ $oldid = $this->getArticleID();
+ $logTitle = clone $this;
+
$logEntry = new ManualLogEntry( 'move', $logType );
$logEntry->setPerformer( $wgUser );
- $logEntry->setTarget( $this );
+ $logEntry->setTarget( $logTitle );
$logEntry->setComment( $reason );
$logEntry->setParameters( array(
'4::target' => $nt->getPrefixedText(),
@@ -3948,8 +3952,6 @@
}
# Truncate for whole multibyte characters.
$comment = $wgContLang->truncate( $comment, 255 );
-
- $oldid = $this->getArticleID();
$dbw = wfGetDB( DB_MASTER );
--
To view, visit https://gerrit.wikimedia.org/r/157872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc20d79093eedcdaba1873861e177ca3a6108bca
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
