jenkins-bot has submitted this change and it was merged.
Change subject: Rename special page class and file to match current conventions
......................................................................
Rename special page class and file to match current conventions
UserMerge --> SpecialUserMerge
UserMerge_body.php --> SpecialUserMerge.php
Change-Id: I3c61e77e892e83f97e0dff8b9127b3e24ae7cb46
---
R SpecialUserMerge.php
M UserMerge.php
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserMerge_body.php b/SpecialUserMerge.php
similarity index 98%
rename from UserMerge_body.php
rename to SpecialUserMerge.php
index e5e5ef4..785b593 100644
--- a/UserMerge_body.php
+++ b/SpecialUserMerge.php
@@ -15,7 +15,7 @@
*
*/
-class UserMerge extends SpecialPage {
+class SpecialUserMerge extends SpecialPage {
function __construct() {
parent::__construct( 'UserMerge', 'usermerge' );
}
@@ -672,3 +672,9 @@
}
}
+
+/**
+ * Former class name, for backwards compatability
+ * @deprecated
+ */
+class UserMerge extends SpecialUserMerge {}
diff --git a/UserMerge.php b/UserMerge.php
index 2eb6380..2848613 100644
--- a/UserMerge.php
+++ b/UserMerge.php
@@ -44,7 +44,9 @@
# $wgGroupPermissions['bureaucrat']['usermerge'] = true;
$dir = __DIR__ . '/';
-$wgAutoloadClasses['UserMerge'] = $dir . 'UserMerge_body.php';
+$wgAutoloadClasses['SpecialUserMerge'] = $dir . 'SpecialUserMerge.php';
+$wgAutoloadClasses['UserMerge'] = $dir . 'SpecialUserMerge.php'; // back-compat
+
$wgMessagesDirs['UserMerge'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php';
--
To view, visit https://gerrit.wikimedia.org/r/138779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c61e77e892e83f97e0dff8b9127b3e24ae7cb46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
