From ad13e54f849f459fb9fcef09de6cec5188c690f6 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Wed, 4 Jan 2012 08:56:36 +0000 Subject: [PATCH] Address an edge case - input being null. Add test cases. --- languages/Language.php | 3 +++ tests/phpunit/languages/LanguageMlTest.php | 2 ++ 2 files changed, 5 insertions(+) diff --git a/languages/Language.php b/languages/Language.php index b204626746..691c43b453 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -2729,6 +2729,9 @@ class Language { */ function commafy( $_ ) { $digitGroupingPattern = $this->digitGroupingPattern(); + if ( $_ === null ) { + return ''; + } if ( !$digitGroupingPattern || $digitGroupingPattern === "###,###,###" ) { // default grouping is at thousands, use the same for ###,###,### pattern too. diff --git a/tests/phpunit/languages/LanguageMlTest.php b/tests/phpunit/languages/LanguageMlTest.php index 45091db827..6e93524647 100644 --- a/tests/phpunit/languages/LanguageMlTest.php +++ b/tests/phpunit/languages/LanguageMlTest.php @@ -30,5 +30,7 @@ class LanguageMlTest extends MediaWikiTestCase { $this->assertEquals( '-98', $this->lang->formatNum( '-98' ) ); $this->assertEquals( '-98', $this->lang->formatNum( -98 ) ); $this->assertEquals( '-1,23,45,678', $this->lang->formatNum( -12345678 ) ); + $this->assertEquals( '', $this->lang->formatNum( '' ) ); + $this->assertEquals( '', $this->lang->formatNum( null ) ); } } -- 2.20.1