MediaWiki 1.16.0

[autoinstalls/mediawiki.git] / includes / api / ApiFormatJson.php

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 1d89eb186ebaed174f460f55588c87215b5d00e7..69686bfb00f977178bb7b4b8c97cda6c7e2eb2a0 100644 (file)
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -23,9 +23,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-if (!defined('MEDIAWIKI')) {
+if ( !defined( 'MEDIAWIKI' ) ) {
        // Eclipse helper - will be ignored in production
-       require_once ('ApiFormatBase.php');
+       require_once ( 'ApiFormatBase.php' );
 }
 
 /**
@@ -35,12 +35,17 @@ class ApiFormatJson extends ApiFormatBase {
 
        private $mIsRaw;
 
-       public function __construct($main, $format) {
-               parent :: __construct($main, $format);
-               $this->mIsRaw = ($format === 'rawfm');
+       public function __construct( $main, $format ) {
+               parent :: __construct( $main, $format );
+               $this->mIsRaw = ( $format === 'rawfm' );
        }
 
        public function getMimeType() {
+               $params = $this->extractRequestParams();
+               // callback:
+               if ( $params['callback'] ) {
+                       return 'text/javascript';
+               }
                return 'application/json';
        }
 
@@ -48,30 +53,29 @@ class ApiFormatJson extends ApiFormatBase {
                return $this->mIsRaw;
        }
 
+       public function getWantsHelp() {
+               // Help is always ugly in JSON
+               return false;
+       }
+
        public function execute() {
                $prefix = $suffix = "";
 
                $params = $this->extractRequestParams();
                $callback = $params['callback'];
-               if(!is_null($callback)) {
-                       $prefix = preg_replace("/[^][.\\'\\\"_A-Za-z0-9]/", "", $callback ) . "(";
+               if ( !is_null( $callback ) ) {
+                       $prefix = preg_replace( "/[^][.\\'\\\"_A-Za-z0-9]/", "", $callback ) . "(";
                        $suffix = ")";
                }
-
-               // Some versions of PHP have a broken json_encode, see PHP bug 
-               // 46944. Test encoding an affected character (U+20000) to 
-               // avoid this.
-               if (!function_exists('json_encode') || $this->getIsHtml() || strtolower(json_encode("\xf0\xa0\x80\x80")) != '\ud840\udc00') {
-                       $json = new Services_JSON();
-                       $this->printText($prefix . $json->encode($this->getResultData(), $this->getIsHtml()) . $suffix);
-               } else {
-                       $this->printText($prefix . json_encode($this->getResultData()) . $suffix);
-               }
+               $this->printText(
+                       $prefix .
+                       FormatJson::encode( $this->getResultData(),     $this->getIsHtml() ) .
+                       $suffix );
        }
 
        public function getAllowedParams() {
                return array (
-                       'callback' => null
+                       'callback'  => null,
                );
        }
 
@@ -82,13 +86,13 @@ class ApiFormatJson extends ApiFormatBase {
        }
 
        public function getDescription() {
-               if ($this->mIsRaw)
+               if ( $this->mIsRaw )
                        return 'Output data with the debuging elements in JSON format' . parent :: getDescription();
                else
                        return 'Output data in JSON format' . parent :: getDescription();
        }
 
        public function getVersion() {
-               return __CLASS__ . ': $Id: ApiFormatJson.php 45682 2009-01-12 19:06:33Z raymond $';
+               return __CLASS__ . ': $Id: ApiFormatJson.php 62354 2010-02-12 06:44:16Z mah $';
        }
 }