From: Ævar Arnfjörð Bjarmason Date: Sat, 9 Apr 2005 01:35:42 +0000 (+0000) Subject: * Reverted my commafyNum patch. X-Git-Tag: 1.5.0alpha1~334 X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=db91701b61c823d1538668955b63250a47d234e5;p=lhc%2Fweb%2Fwiklou.git * Reverted my commafyNum patch. --- diff --git a/includes/Parser.php b/includes/Parser.php index b4e4b7317d..86ad3a8d84 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -1731,7 +1731,7 @@ class Parser case MAG_CURRENTDOW: return $varCache[$index] = $wgContLang->formatNum( date('w') ); case MAG_NUMBEROFARTICLES: - return $varCache[$index] = $wgContLang->formatNum( commafyNum( wfNumberOfArticles() ) ); + return $varCache[$index] = $wgContLang->formatNum( wfNumberOfArticles() ); case MAG_SITENAME: return $wgSitename; case MAG_SERVER: @@ -3057,40 +3057,6 @@ function &outputReplaceMatches( $matches ) { return $outputReplace[$matches[1]]; } -/** - * Formats a number like 1520626 as 1,520,626 and 1520626.34 as 1,520,626.34 - * - * @todo It's possible to do this with a regex, see perlfaq5 - * - * @param mixed Numbers in the form of integers, floats or strings. - * @return string - */ -function commafyNum( $input ) { - if ( preg_match('/^\d+$/', $input) ) { - $intpart =& $input; - } elseif ( preg_match('/^\d+\.\d+$/', $input) ) { - list($intpart, $floatpart) = explode( '.', $input); - } else { - wfDebug("Error: Invalid input given to seperateNumber()\n"); - return; - } - - $chars = preg_split( '//', $intpart, -1, PREG_SPLIT_NO_EMPTY ); - - $len = count($chars); - for($i = 0, $nr = 0; $i < $len; ++$i ) { - if ($nr++ % 3 === 0 && $i !== 0) - $t[] = ','; - $t[] = array_pop($chars); - } - - $str = implode( null, array_reverse($t) ); - - if ( isset($floatpart) ) - $str .= '.' . $floatpart; - return $str; -} - /** * Return the total number of articles */