From 2a59db5897296b30af277abba8e9a4d1471da27e Mon Sep 17 00:00:00 2001 From: Philip Tzou Date: Thu, 29 Jan 2009 07:43:03 +0000 Subject: [PATCH] mTables' element must not be left blank, to ensure the translate() function could always return a string. --- languages/LanguageConverter.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index a070f3f281..63b98f1292 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -296,12 +296,19 @@ class LanguageConverter { if( !in_array($v,$this->mVariants) )continue; if( $action=="add" ) { foreach($t as $from=>$to) { - // more efficient than array_merge(), about 2.5 times. - $this->mManualAddTables[$v][$from] = $to; + // to ensure that $from and $to not be left blank + // so $this->translate() could always return a string + if ($from || $to) + // more efficient than array_merge(), about 2.5 times. + $this->mManualAddTables[$v][$from] = $to; + } + } + elseif ( $action=="remove" ) { + foreach($t as $from=>$to) { + if ($from || $to) + $this->mManualRemoveTables[$v][$from] = $to; } } - elseif ( $action=="remove" ) - $this->mManualRemoveTables[$v] = array_merge($this->mManualRemoveTables[$v], $t); } } -- 2.20.1