Use DB_PRIMARY instead of deprecated DB_MASTER

Raise support floor to 1.35.3 for this.

Change-Id: I1eb2b1728e84b5ceb5de0f9496ccca740d0df2ca
这个提交包含在:
Alexander Vorwerk 2021-09-19 19:19:01 +02:00 提交者 Umherirrender
父节点 6ea4430cf6
当前提交 55630ffbb5
共有 2 个文件被更改,包括 7 次插入7 次删除

查看文件

@ -9,6 +9,9 @@
"url": "https://www.mediawiki.org/wiki/Extension:GlobalUserrights",
"descriptionmsg": "gur-desc",
"type": "specialpage",
"requires": {
"MediaWiki": ">= 1.35.3"
},
"SpecialPages": {
"GlobalUserrights": "GlobalUserrights"
},
@ -54,8 +57,5 @@
"userrights-global": true
}
},
"requires": {
"MediaWiki": ">= 1.32.0"
},
"manifest_version": 1
}

查看文件

@ -105,7 +105,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
}
if ( $dbw === null ) {
$dbw = wfGetDB( DB_MASTER );
$dbw = wfGetDB( DB_PRIMARY );
}
$dbw->delete(
@ -130,7 +130,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @return bool Whether or not anything was inserted
*/
public function insert( $allowUpdate = false, IDatabase $dbw = null ) {
$dbw = $dbw ?: wfGetDB( DB_MASTER );
$dbw = $dbw ?: wfGetDB( DB_PRIMARY );
// Purge old, expired memberships from the DB
self::purgeExpired( $dbw );
@ -218,7 +218,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
}
if ( $dbw === null ) {
$dbw = wfGetDB( DB_MASTER );
$dbw = wfGetDB( DB_PRIMARY );
}
DeferredUpdates::addUpdate( new AtomicSectionUpdate(
@ -243,7 +243,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
*/
public static function getMembershipsForUser( $userId, IDatabase $db = null ) {
if ( !$db ) {
$db = wfGetDB( DB_MASTER );
$db = wfGetDB( DB_PRIMARY );
}
$res = $db->select( 'global_user_groups',