From 6d7f0c510d3b9cfaa51dc0213d3b226ccdcdffb4 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sat, 30 Apr 2011 16:52:28 +0000 Subject: [PATCH] Followup r87150 Reuse SpecialVersions arrayToString (made it explicitly public!) in an array_amp for the formatting of arrays/objects (Yay for all the different ways we accept things ;P) --- includes/api/ApiQuerySiteinfo.php | 2 +- includes/specials/SpecialVersion.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index dde27a58d2..ed277b90a8 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -510,7 +510,7 @@ class ApiQuerySiteinfo extends ApiQueryBase { foreach ( $myWgHooks as $hook => $hooks ) { $arr = array( 'name' => $hook, - 'subscribers' => $hooks, + 'subscribers' => array_map( array( 'SpecialVersion', 'arrayToString' ), $hooks ), ); $this->getResult()->setIndexedTagName( $arr['subscribers'], 's' ); diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 24d8908a5a..2a727e6b1f 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -564,9 +564,10 @@ class SpecialVersion extends SpecialPage { * * @return Mixed */ - static function arrayToString( $list ) { - if( is_array( $list ) && count( $list ) == 1 ) + public static function arrayToString( $list ) { + if( is_array( $list ) && count( $list ) == 1 ) { $list = $list[0]; + } if( is_object( $list ) ) { $class = get_class( $list ); return "($class)"; -- 2.20.1