From a7be78d438fe2a04faf4aba696785b9a073e9ada Mon Sep 17 00:00:00 2001 From: Reedy Date: Thu, 17 Apr 2014 20:00:35 +0100 Subject: [PATCH] Simplify SpecialVersion:listToText() Don't special case $list only having one item Unindent else block Bug: 64069 Change-Id: I171a64147fe00f00ac0523ccf58fea11e800e2fd --- includes/specials/SpecialVersion.php | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 9ad95ec0f7..dee44cd2e7 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -961,21 +961,15 @@ class SpecialVersion extends SpecialPage { * @return string */ function listToText( $list, $sort = true ) { - $cnt = count( $list ); - - if ( $cnt == 1 ) { - // Enforce always returning a string - return (string)self::arrayToString( $list[0] ); - } elseif ( $cnt == 0 ) { + if ( !count( $list ) ) { return ''; - } else { - if ( $sort ) { - sort( $list ); - } - - return $this->getLanguage() - ->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) ); } + if ( $sort ) { + sort( $list ); + } + + return $this->getLanguage() + ->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) ); } /** -- 2.20.1