jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351234 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
......................................................................
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I51ea92dabdcff8ab1a94e37641bb55fc79386efd
---
M SpecialAddFan.php
M SpecialRemoveFan.php
M SpecialSportsManagerLogo.php
M SpecialSportsTeamsManager.php
M SpecialSportsTeamsManagerLogo.php
M SpecialUpdateFavoriteTeams.php
M extension.json
7 files changed, 11 insertions(+), 29 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialAddFan.php b/SpecialAddFan.php
index b34392f..72f675d 100644
--- a/SpecialAddFan.php
+++ b/SpecialAddFan.php
@@ -58,10 +58,7 @@
}
// If the database is in read-only mode, bail out
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return true;
- }
+ $this->checkReadOnly();
if ( $team_id ) {
$team = SportsTeams::getTeam( $team_id );
@@ -136,4 +133,4 @@
$out->addHTML( $output );
}
-}
\ No newline at end of file
+}
diff --git a/SpecialRemoveFan.php b/SpecialRemoveFan.php
index cbfdb65..18adade 100644
--- a/SpecialRemoveFan.php
+++ b/SpecialRemoveFan.php
@@ -57,10 +57,7 @@
}
// If the database is in read-only mode, bail out
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return true;
- }
+ $this->checkReadOnly();
if ( $team_id ) {
$team = SportsTeams::getTeam( $team_id );
@@ -131,4 +128,4 @@
$out->addHTML( $output );
}
-}
\ No newline at end of file
+}
diff --git a/SpecialSportsManagerLogo.php b/SpecialSportsManagerLogo.php
index 364e5e1..fcff4cb 100644
--- a/SpecialSportsManagerLogo.php
+++ b/SpecialSportsManagerLogo.php
@@ -106,10 +106,7 @@
throw new ErrorPageError( 'uploadnologin',
'uploadnologintext' );
return;
}
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
/** Check if the image directory is writeable, this is a common
mistake */
if ( !is_writeable( $wgUploadDirectory ) ) {
diff --git a/SpecialSportsTeamsManager.php b/SpecialSportsTeamsManager.php
index 81799c1..ff46e11 100644
--- a/SpecialSportsTeamsManager.php
+++ b/SpecialSportsTeamsManager.php
@@ -34,10 +34,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If the user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
@@ -362,4 +359,4 @@
</form>';
return $form;
}
-}
\ No newline at end of file
+}
diff --git a/SpecialSportsTeamsManagerLogo.php
b/SpecialSportsTeamsManagerLogo.php
index 62f4233..d2cba8f 100644
--- a/SpecialSportsTeamsManagerLogo.php
+++ b/SpecialSportsTeamsManagerLogo.php
@@ -105,10 +105,7 @@
throw new ErrorPageError( 'uploadnologin',
'uploadnologintext' );
return;
}
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
/** Check if the image directory is writeable, this is a common
mistake */
if ( !is_writeable( $wgUploadDirectory ) ) {
diff --git a/SpecialUpdateFavoriteTeams.php b/SpecialUpdateFavoriteTeams.php
index e345bdf..ad5672c 100644
--- a/SpecialUpdateFavoriteTeams.php
+++ b/SpecialUpdateFavoriteTeams.php
@@ -137,10 +137,7 @@
}
// If the database is in read-only mode, bail out
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return true;
- }
+ $this->checkReadOnly();
$sports = SportsTeams::getSports();
// Error message when there are no sports in the database
@@ -290,4 +287,4 @@
$out->addHTML( $output );
}
-}
\ No newline at end of file
+}
diff --git a/extension.json b/extension.json
index 18c0537..19ceb2a 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "SportsTeams",
- "version": "3.4",
+ "version": "3.4.1",
"author": [
"Aaron Wright",
"Ashish Datta",
--
To view, visit https://gerrit.wikimedia.org/r/351234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51ea92dabdcff8ab1a94e37641bb55fc79386efd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SportsTeams
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
