Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228399
Change subject: Load talk page manager user less often.
......................................................................
Load talk page manager user less often.
- Define a constant instead of using the
hard-coded name everywhere.
Change-Id: I392589885436ef325350663251f02ceabeea12fe
---
M Hooks.php
M defines.php
M includes/TalkpageManager.php
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/99/228399/1
diff --git a/Hooks.php b/Hooks.php
index 9482cf5..78f9ae7 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -676,7 +676,7 @@
$names[] = 'msg:flow-system-usertext';
// Reserve the bot account we use during content model changes
& LQT conversion
- $names[] = 'Flow talk page manager';
+ $names[] = FLOW_TALK_PAGE_MANAGER_USER;
return true;
}
@@ -953,8 +953,7 @@
* @return bool
*/
private static function isTalkpageManagerUser( User $user ) {
- $talkPageManagerUser =
self::$occupationController->getTalkpageManager();
- return $user && $user->equals( $talkPageManagerUser );
+ return $user && $user->getName() ===
FLOW_TALK_PAGE_MANAGER_USER;
}
/**
diff --git a/defines.php b/defines.php
index fa63317..40381ec 100644
--- a/defines.php
+++ b/defines.php
@@ -3,3 +3,4 @@
// Constants
define( 'RC_FLOW', 142 ); // Random number chosen. Can be replaced with
rc_source; see bug 72157.
define( 'NS_TOPIC', 2600 );
+define( 'FLOW_TALK_PAGE_MANAGER_USER', 'Flow talk page manager' );
\ No newline at end of file
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index c585592..27cd0e3 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -253,11 +253,11 @@
}
- $user = User::newFromName( 'Flow talk page manager' );
+ $user = User::newFromName( FLOW_TALK_PAGE_MANAGER_USER );
if ( $user->getId() === 0 ) {
// Does not exist, lets create it
- $user->loadDefaults( 'Flow talk page manager' );
+ $user->loadDefaults( FLOW_TALK_PAGE_MANAGER_USER );
$user->addToDatabase();
if ( class_exists( 'CentralAuthUser' ) ) {
// Attach to CentralAuth if a global account
already
--
To view, visit https://gerrit.wikimedia.org/r/228399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I392589885436ef325350663251f02ceabeea12fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
