jenkins-bot has submitted this change and it was merged.
Change subject: Use MovePageIsValidMove hook if possible
......................................................................
Use MovePageIsValidMove hook if possible
Change-Id: Ic5026384b92a0d68d628397ffe1de6e5b6183f02
---
M EducationProgram.hooks.php
M EducationProgram.php
2 files changed, 17 insertions(+), 6 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index b422066..db23831 100644
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -383,6 +383,17 @@
return true;
}
+ public static function onMovePageIsValidMove( Title $oldTitle, Title
$newTitle, \Status $status ) {
+ $nss = array( EP_NS, EP_NS_TALK );
+ $allowed = !in_array( $oldTitle->getNamespace(), $nss ) &&
!in_array( $newTitle->getNamespace(), $nss );
+
+ if ( !$allowed ) {
+ $status->fatal( 'ep-move-error' );
+ }
+
+ return $allowed;
+ }
+
/**
* Allows canceling the move of one title to another.
* @see https://www.mediawiki.org/wiki/Manual:Hooks/AbortMove
@@ -398,14 +409,13 @@
* @return boolean
*/
public static function onAbortMove( Title $oldTitle, Title $newTitle,
User $user, &$error, $reason ) {
- $nss = array( EP_NS, EP_NS_TALK );
- $allowed = !in_array( $oldTitle->getNamespace(), $nss ) &&
!in_array( $newTitle->getNamespace(), $nss );
-
- if ( !$allowed ) {
- $error = wfMessage( 'ep-move-error' )->text();
+ $status = new \Status();
+ self::onMovePageIsValidMove( $oldTitle, $newTitle, $status );
+ if ( !$status->isOK() ) {
+ $error = $status->getHTML();
}
- return $allowed;
+ return $status->isOK();
}
/**
diff --git a/EducationProgram.php b/EducationProgram.php
index 113198e..ab6cad3 100644
--- a/EducationProgram.php
+++ b/EducationProgram.php
@@ -268,6 +268,7 @@
$wgHooks['ArticleFromTitle'][]
= 'EducationProgram\Hooks::onArticleFromTitle';
$wgHooks['CanonicalNamespaces'][] =
'EducationProgram\Hooks::onCanonicalNamespaces';
$wgHooks['TitleIsAlwaysKnown'][] =
'EducationProgram\Hooks::onTitleIsAlwaysKnown';
+$wgHooks['MovePageIsValidMove'][] =
'EducationProgram\Hooks::onMovePageIsValidMove';
$wgHooks['AbortMove'][]
= 'EducationProgram\Hooks::onAbortMove';
$wgHooks['NewRevisionFromEditComplete'][] =
'EducationProgram\Hooks::onNewRevisionFromEditComplete';
$wgHooks['NamespaceIsMovable'][] =
'EducationProgram\Hooks::onNamespaceIsMovable';
--
To view, visit https://gerrit.wikimedia.org/r/169021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5026384b92a0d68d628397ffe1de6e5b6183f02
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
