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)

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index dde27a5..ed277b9 100644 (file)
--- 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 24d8908..2a727e6 100644 (file)
--- 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)";