Merge branch 'wikimedia:master' into master

harryajc · Sep 22, 2021 · 3266ca8 · 3266ca8
2 parents ba61901 + e7689be
commit 3266ca8
Show file tree

Hide file tree

Showing 4 changed files with 530 additions and 759 deletions.
diff --git a/extension.json b/extension.json
@@ -11,7 +11,7 @@
 	"manifest_version": 1,
 	"type": "parserhook",
 	"requires": {
-		"MediaWiki": ">= 1.32.0"
+		"MediaWiki": ">= 1.35.3"
 	},
 	"MessagesDirs": {
 		"UserAgreement": [

diff --git a/includes/ApiUAAcceptAgreement.php b/includes/ApiUAAcceptAgreement.php
@@ -40,7 +40,7 @@ public function __construct( $main, $action ) {
 	 */
 	public function execute() {
 		$userId = $this->getUser()->getId();
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = wfGetDB( DB_PRIMARY );
 		$dbw->upsert(
 			'useragreement',
 			[