jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404139 )
Change subject: Use ReadOnlyMode MediaWiki service introduced in 1.29.0
......................................................................
Use ReadOnlyMode MediaWiki service introduced in 1.29.0
This helps avoid calling the global wfReadOnly function,
and in turn uses a MediaWiki service instead, introduced
in 1.29.0.
Change-Id: I841504ac3316c2bb264a82a56780482fa1ed4a11
---
M UserBoard/ApiDeleteUserBoardMessage.php
M UserBoard/ApiSendUserBoardMessage.php
M UserRelationship/ApiRelationshipResponse.php
3 files changed, 12 insertions(+), 3 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserBoard/ApiDeleteUserBoardMessage.php
b/UserBoard/ApiDeleteUserBoardMessage.php
index 85edd33..0238a18 100644
--- a/UserBoard/ApiDeleteUserBoardMessage.php
+++ b/UserBoard/ApiDeleteUserBoardMessage.php
@@ -1,14 +1,17 @@
<?php
+use MediaWiki\MediaWikiServices;
+
class ApiDeleteUserBoardMessage extends ApiBase {
public function execute() {
$main = $this->getMain();
$user = $this->getUser();
+ $readOnlyMode =
MediaWikiServices::getInstance()->getReadOnlyMode();
$messageId = $main->getVal( 'id' );
// Don't allow deleting messages when the database is locked
for some reason
- if ( wfReadOnly() ) {
+ if ( $readOnlyMode->isReadOnly() ) {
$this->getResult()->addValue( null, 'result', 'You
cannot delete messages right now.' );
return true;
}
diff --git a/UserBoard/ApiSendUserBoardMessage.php
b/UserBoard/ApiSendUserBoardMessage.php
index b8853ec..d4e9754 100644
--- a/UserBoard/ApiSendUserBoardMessage.php
+++ b/UserBoard/ApiSendUserBoardMessage.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\MediaWikiServices;
+
class ApiSendUserBoardMessage extends ApiBase {
public function execute() {
$main = $this->getMain();
@@ -9,10 +11,11 @@
$message_type = $main->getVal( 'type' ) || 0;
$user = $this->getUser();
+ $readOnlyMode =
MediaWikiServices::getInstance()->getReadOnlyMode();
// Don't allow blocked users to send messages and also don't
allow message
// sending when the database is locked for some reason
- if ( $user->isBlocked() || wfReadOnly() ) {
+ if ( $user->isBlocked() || $readOnlyMode->isReadOnly() ) {
$this->getResult()->addValue( null, 'result', 'You
cannot send messages.' );
return true;
}
diff --git a/UserRelationship/ApiRelationshipResponse.php
b/UserRelationship/ApiRelationshipResponse.php
index 09676b7..8d772ee 100644
--- a/UserRelationship/ApiRelationshipResponse.php
+++ b/UserRelationship/ApiRelationshipResponse.php
@@ -1,5 +1,7 @@
<?php
+use MediaWiki\MediaWikiServices;
+
class ApiRelationshipResponse extends ApiBase {
public function execute() {
$main = $this->getMain();
@@ -8,10 +10,11 @@
$requestId = $main->getVal( 'id' );
$user = $this->getUser();
+ $readOnlyMode =
MediaWikiServices::getInstance()->getReadOnlyMode();
// Don't allow blocked users to send messages and also don't
allow message
// sending when the database is locked for some reason
- if ( $user->isBlocked() || wfReadOnly() ) {
+ if ( $user->isBlocked() || $readOnlyMode->isReadOnly() ) {
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/404139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I841504ac3316c2bb264a82a56780482fa1ed4a11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com>
Gerrit-Reviewer: Jack Phoenix <ash...@uncyclomedia.co>
Gerrit-Reviewer: Lewis Cawte <le...@lewiscawte.me>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
