jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398511 )
Change subject: Use extension registry to check for CheckUser to be installed
......................................................................
Use extension registry to check for CheckUser to be installed
Class was renamed in I39c60b2d059d1cb2c1c0d3a4206232d961536697
Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
---
M includes/LoginNotify.php
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 956c629..b5e7d12 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -12,6 +12,7 @@
use CentralAuthUser;
use Config;
use EchoEvent;
+use ExtensionRegistry;
use IBufferingStatsdDataFactory;
use JobQueueGroup;
use JobSpecification;
@@ -238,7 +239,7 @@
Assert::parameter( $user->isLoggedIn(), '$user', 'User must be
logged in' );
if ( !$this->config->get( 'LoginNotifyCheckKnownIPs' )
- || !class_exists( 'CheckUser' )
+ || !$this->isCheckUserInstalled()
) {
// Checkuser checks disabled.
// Note: It's important this be USER_NOT_KNOWN and not
USER_NO_INFO.
@@ -402,6 +403,14 @@
}
/**
+ * Whether CheckUser extension is installed
+ * @return bool
+ */
+ private function isCheckUserInstalled() {
+ return ExtensionRegistry::getInstance()->isLoaded( 'CheckUser'
);
+ }
+
+ /**
* Give the user a cookie saying that they've previously logged in from
this computer.
*
* @note If user already has a cookie, this will refresh it.
--
To view, visit https://gerrit.wikimedia.org/r/398511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ca79302b9bbd8999e49a134240420d5cd6117c1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
