Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/264591

Change subject: Remove getCustomPrinter() from ApiJsonSchema
......................................................................

Remove getCustomPrinter() from ApiJsonSchema

Bug: T91454
Change-Id: If280a4056aa6a816774da25cc641dfbee2ac504e
---
M includes/ApiJsonSchema.php
M includes/RemoteSchema.php
2 files changed, 1 insertion(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging 
refs/changes/91/264591/1

diff --git a/includes/ApiJsonSchema.php b/includes/ApiJsonSchema.php
index ab4dea2..55f8a15 100644
--- a/includes/ApiJsonSchema.php
+++ b/includes/ApiJsonSchema.php
@@ -17,20 +17,6 @@
  */
 class ApiJsonSchema extends ApiBase {
 
-       /**
-        * Restrict the set of valid formatters to just 'json' and 'jsonfm'.  
Other
-        * requested formatters are instead treated as 'json'.
-        * @return ApiFormatJson
-        */
-       public function getCustomPrinter() {
-               if ( $this->getMain()->getVal( 'format' ) === 'jsonfm' ) {
-                       $format = 'jsonfm';
-               } else {
-                       $format = 'json';
-               }
-               return $this->getMain()->createPrinterByName( $format );
-       }
-
        public function getAllowedParams() {
                return array(
                        'revid' => array(
diff --git a/includes/RemoteSchema.php b/includes/RemoteSchema.php
index d4e3588..e952faf 100644
--- a/includes/RemoteSchema.php
+++ b/includes/RemoteSchema.php
@@ -125,6 +125,7 @@
                        'action' => 'jsonschema',
                        'revid'  => $this->revision,
                        'formatversion' => 2,
+                       'format' => 'json',
                ) );
        }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/264591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If280a4056aa6a816774da25cc641dfbee2ac504e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: wmf/1.27.0-wmf.10
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: IoannisKydonis <gianisk...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to