jenkins-bot has submitted this change and it was merged.
Change subject: $wgDisableUnmergedEditing should also prevent deletion
......................................................................
$wgDisableUnmergedEditing should also prevent deletion
This was fixed by core change Ibe28a69c, but would be unfixed by
I5a7c4147. So let's fix it explicitly here.
Bug: 69380
Change-Id: I7ba167f0591b7caab9022193375ea30b02922afd
---
M CentralAuthHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuthHooks.php b/CentralAuthHooks.php
index 6cad1c1..039174b 100644
--- a/CentralAuthHooks.php
+++ b/CentralAuthHooks.php
@@ -1222,7 +1222,7 @@
$centralUser = CentralAuthUser::getInstance( $user );
if ( $wgDisableUnmergedEditing
- && $action === 'edit'
+ && ( $action === 'edit' || $action === 'delete' )
&& !$centralUser->exists()
&& !$title->inNamespaces( NS_USER_TALK, NS_PROJECT_TALK
)
) {
--
To view, visit https://gerrit.wikimedia.org/r/155070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ba167f0591b7caab9022193375ea30b02922afd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
