API bug 10046: incorrect action produces invalid response format

[lhc/web/wiklou.git] / includes / CoreParserFunctions.php

diff --git a/includes/CoreParserFunctions.php b/includes/CoreParserFunctions.php
index 2b05437..72ceb45 100644 (file)
--- a/includes/CoreParserFunctions.php
+++ b/includes/CoreParserFunctions.php
@@ -2,8 +2,8 @@
 
 /**
  * Various core parser functions, registered in Parser::firstCallInit()
+ * @addtogroup Parser
  */
-
 class CoreParserFunctions {
        static function intFunction( $parser, $part1 = '' /*, ... */ ) {
                if ( strval( $part1 ) !== '' ) {
@@ -59,20 +59,12 @@ class CoreParserFunctions {
                return $wgContLang->uc( $s );
        }
 
-       static function ic( $parser, $s = '' ) {
-               /*Testing showed that ucwords does NOT convert the rest of the words to lowercase
-                * Converting it all to lowercase first fixes this. */
-               $s = strtolower($s);
-               return ucwords($s);
-       }
-
        static function localurl( $parser, $s = '', $arg = null ) { return self::urlFunction( 'getLocalURL', $s, $arg ); }
        static function localurle( $parser, $s = '', $arg = null ) { return self::urlFunction( 'escapeLocalURL', $s, $arg ); }
        static function fullurl( $parser, $s = '', $arg = null ) { return self::urlFunction( 'getFullURL', $s, $arg ); }
        static function fullurle( $parser, $s = '', $arg = null ) { return self::urlFunction( 'escapeFullURL', $s, $arg ); }
 
        static function urlFunction( $func, $s = '', $arg = null ) {
-               $found = false;
                $title = Title::newFromText( $s );
                # Due to order of execution of a lot of bits, the values might be encoded
                # before arriving here; if that's true, then the title can't be created
@@ -86,28 +78,26 @@ class CoreParserFunctions {
                        } else {
                                $text = $title->$func();
                        }
-                       $found = true;
-               }
-               if ( $found ) {
                        return $text;
                } else {
                        return array( 'found' => false );
                }
        }
 
-       function formatNum( $parser, $num = '' ) {
+       static function formatNum( $parser, $num = '' ) {
                return $parser->getFunctionLang()->formatNum( $num );
        }
-       
-       function grammar( $parser, $case = '', $word = '' ) {
+
+       static function grammar( $parser, $case = '', $word = '' ) {
                return $parser->getFunctionLang()->convertGrammar( $word, $case );
        }
 
-       function plural( $parser, $text = '', $arg0 = null, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null ) {
+       static function plural( $parser, $text = '', $arg0 = null, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null ) {
+               $text = $parser->getFunctionLang()->parseFormattedNumber( $text );
                return $parser->getFunctionLang()->convertPlural( $text, $arg0, $arg1, $arg2, $arg3, $arg4 );
        }
 
-       function displaytitle( $parser, $param = '' ) {
+       static function displaytitle( $parser, $param = '' ) {
                $parserOptions = new ParserOptions;
                $local_parser = clone $parser;
                $t2 = $local_parser->parse ( $param, $parser->mTitle, $parserOptions, false );
@@ -119,7 +109,7 @@ class CoreParserFunctions {
                return '';
        }
 
-       function isRaw( $param ) {
+       static function isRaw( $param ) {
                static $mwRaw;
                if ( !$mwRaw ) {
                        $mwRaw =& MagicWord::get( 'rawsuffix' );
@@ -131,23 +121,24 @@ class CoreParserFunctions {
                }
        }
 
-       function statisticsFunction( $func, $raw = null ) {
+       static function statisticsFunction( $func, $raw = null ) {
                if ( self::isRaw( $raw ) ) {
-                       return call_user_func( $func );
+                       return call_user_func( array( 'SiteStats', $func ) );
                } else {
                        global $wgContLang;
-                       return $wgContLang->formatNum( call_user_func( $func ) );
+                       return $wgContLang->formatNum( call_user_func( array( 'SiteStats', $func ) ) );
                }
        }
 
-       function numberofpages( $parser, $raw = null ) { return self::statisticsFunction( 'wfNumberOfPages', $raw ); }
-       function numberofusers( $parser, $raw = null ) { return self::statisticsFunction( 'wfNumberOfUsers', $raw ); }
-       function numberofarticles( $parser, $raw = null ) { return self::statisticsFunction( 'wfNumberOfArticles', $raw ); }
-       function numberoffiles( $parser, $raw = null ) { return self::statisticsFunction( 'wfNumberOfFiles', $raw ); }
-       function numberofadmins( $parser, $raw = null ) { return self::statisticsFunction( 'wfNumberOfAdmins', $raw ); }
+       static function numberofpages( $parser, $raw = null ) { return self::statisticsFunction( 'pages', $raw ); }
+       static function numberofusers( $parser, $raw = null ) { return self::statisticsFunction( 'users', $raw ); }
+       static function numberofarticles( $parser, $raw = null ) { return self::statisticsFunction( 'articles', $raw ); }
+       static function numberoffiles( $parser, $raw = null ) { return self::statisticsFunction( 'images', $raw ); }
+       static function numberofadmins( $parser, $raw = null ) { return self::statisticsFunction( 'admins', $raw ); }
+       static function numberofedits( $parser, $raw = null ) { return self::statisticsFunction( 'edits', $raw ); }
 
-       function pagesinnamespace( $parser, $namespace = 0, $raw = null ) {
-               $count = wfPagesInNs( intval( $namespace ) );
+       static function pagesinnamespace( $parser, $namespace = 0, $raw = null ) {
+               $count = SiteStats::pagesInNs( intval( $namespace ) );
                if ( self::isRaw( $raw ) ) {
                        global $wgContLang;
                        return $wgContLang->formatNum( $count );
@@ -156,33 +147,37 @@ class CoreParserFunctions {
                }
        }
 
-       function language( $parser, $arg = '' ) {
+       static function language( $parser, $arg = '' ) {
                global $wgContLang;
                $lang = $wgContLang->getLanguageName( strtolower( $arg ) );
                return $lang != '' ? $lang : $arg;
        }
-       
-       function pad( $string = '', $length = 0, $char = 0, $direction = STR_PAD_RIGHT ) {
+
+       static function pad( $string = '', $length = 0, $char = 0, $direction = STR_PAD_RIGHT ) {
                $length = min( max( $length, 0 ), 500 );
                $char = substr( $char, 0, 1 );
                return ( $string && (int)$length > 0 && strlen( trim( (string)$char ) ) > 0 )
                                ? str_pad( $string, $length, (string)$char, $direction )
                                : $string;
        }
-       
-       function padleft( $parser, $string = '', $length = 0, $char = 0 ) {
+
+       static function padleft( $parser, $string = '', $length = 0, $char = 0 ) {
                return self::pad( $string, $length, $char, STR_PAD_LEFT );
        }
-       
-       function padright( $parser, $string = '', $length = 0, $char = 0 ) {
+
+       static function padright( $parser, $string = '', $length = 0, $char = 0 ) {
                return self::pad( $string, $length, $char );
        }
-       
-       function anchorencode( $parser, $text ) {
-               return str_replace( '%', '.', str_replace('+', '_', urlencode( $text ) ) );
+
+       static function anchorencode( $parser, $text ) {
+               $a = urlencode( $text );
+               $a = strtr( $a, array( '%' => '.', '+' => '_' ) );
+               # leave colons alone, however
+               $a = str_replace( '.3A', ':', $a );
+               return $a;
        }
 
-       function special( $parser, $text ) {
+       static function special( $parser, $text ) {
                $title = SpecialPage::getTitleForAlias( $text );
                if ( $title ) {
                        return $title->getPrefixedText();
@@ -190,6 +185,12 @@ class CoreParserFunctions {
                        return wfMsgForContent( 'nosuchspecialpage' );
                }
        }
-}
 
+       public static function defaultsort( $parser, $text ) {
+               $text = trim( $text );
+               if( strlen( $text ) > 0 )
+                       $parser->setDefaultSort( $text );
+               return '';
+       }
+}
 ?>