jenkins-bot has submitted this change and it was merged.
Change subject: Remove $wgEnableAPI support
......................................................................
Remove $wgEnableAPI support
Bug: T115414
Change-Id: Ieb2cb177d421d1e81bfe8d3ca522342935303be3
---
M INSTALL
M i18n/en.json
M i18n/qqq.json
M includes/Helpers/WikiChecks.php
4 files changed, 0 insertions(+), 21 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/INSTALL b/INSTALL
index 2628035..bde93e3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -77,7 +77,6 @@
are not set as indicated, you can make the changes in the `LocalSettings.php`
file.
-* `$wgEnableAPI = true`
* `$wgEnableWriteAPI = true`
* `$wgMaxImageArea = 6.4e7`; // when not using ImageMagick, otherwise leave it
as is
diff --git a/i18n/en.json b/i18n/en.json
index ce1fe1c..7241861 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -194,7 +194,6 @@
"gwtoolset-permission-not-given": "Make sure that you are logged in or
contact an administrator in order to be granted permission to view this page
($1).",
"gwtoolset-user-blocked": "Your user account is currently blocked.
Please contact an administrator in order to correct the blocking issue.",
"gwtoolset-required-group": "You are not a member of the $1 group.",
- "gwtoolset-verify-api-enabled": "The $1 extension requires that the
wiki API is enabled.\n\nPlease make sure that <code>$wgEnableAPI</code> is set
to <code>true</code>.",
"gwtoolset-verify-api-writeable": "The $1 extension requires that the
wiki API can perform write actions for authorized users.\n\nPlease make sure
that <code>$wgEnableWriteAPI</code> is set to <code>true</code>.",
"gwtoolset-verify-curl": "The $1 extension requires that PHP
[http://www.php.net/manual/en/curl.setup.php cURL functions] be installed.",
"gwtoolset-verify-finfo": "The $1 extension requires that the PHP
[http://www.php.net/manual/en/fileinfo.setup.php finfo] extension be
installed.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 87b66dd..61ffe96 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -196,7 +196,6 @@
"gwtoolset-permission-not-given": "Message that appears when the user
does not have the proper wiki permissions.\n\nParameters:\n* $1 - the message
{{msg-mw|Gwtoolset-no-upload-by-url}}",
"gwtoolset-user-blocked": "Message that appears when the user is
blocked from using the wiki.",
"gwtoolset-required-group": "User message that appears when the user is
not a member of the required group. Parameters:\n* $1 is the required group.",
- "gwtoolset-verify-api-enabled": "Message that appears when the API has
not been enabled. Parameters:\n* $1 - \"GWToolset\" (untranslatable)\nSee
also:\n* {{msg-mw|Gwtoolset-verify-api-writeable}}",
"gwtoolset-verify-api-writeable": "Message that appears when the API
cannot write to the wiki. Parameters:\n* $1 - \"GWToolset\"
(untranslatable)\nSee also:\n* {{msg-mw|Gwtoolset-verify-api-enabled}}",
"gwtoolset-verify-curl": "Message that appears when PHP cURL is not
available. Parameters:\n* $1 - \"GWToolset\" (untranslatable)",
"gwtoolset-verify-finfo": "Message that appears when PHP finfo is not
available. Parameters:\n* $1 - \"GWToolset\" (untranslatable)",
diff --git a/includes/Helpers/WikiChecks.php b/includes/Helpers/WikiChecks.php
index c7a9e25..e771c40 100644
--- a/includes/Helpers/WikiChecks.php
+++ b/includes/Helpers/WikiChecks.php
@@ -246,11 +246,6 @@
return $Status;
}
- $Status = self::verifyAPIEnabled();
- if ( !$Status->ok ) {
- return $Status;
- }
-
$Status = self::verifyAPIWritable();
if ( !$Status->ok ) {
return $Status;
@@ -304,19 +299,6 @@
if ( !$wgEnableUploads || ( !wfIsHHVM() && !wfIniGetBool(
'file_uploads' ) ) ) {
return Status::newFatal(
'gwtoolset-verify-uploads-enabled', Constants::EXTENSION_NAME );
- }
-
- return Status::newGood();
- }
-
- /**
- * @return {Status}
- */
- public static function verifyAPIEnabled() {
- global $wgEnableAPI;
-
- if ( !$wgEnableAPI ) {
- return Status::newFatal(
'gwtoolset-verify-api-enabled', Constants::EXTENSION_NAME );
}
return Status::newGood();
--
To view, visit https://gerrit.wikimedia.org/r/246454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb2cb177d421d1e81bfe8d3ca522342935303be3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Aklapper <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
