From 94f09907d0d35f28a6799fba75c36b45f8a2ade3 Mon Sep 17 00:00:00 2001 From: Victor Vasiliev Date: Thu, 2 Jul 2009 12:59:04 +0000 Subject: [PATCH] Replace || with |, so messages get merged regardless of $used value --- includes/LocalisationCache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php index 7933007583..142dc2cc8b 100644 --- a/includes/LocalisationCache.php +++ b/includes/LocalisationCache.php @@ -500,7 +500,7 @@ class LocalisationCache { $data = $this->readPHPFile( $fileName, 'extension' ); $used = false; foreach ( $data as $key => $item ) { - $used = $used || + $used = $used | $this->mergeExtensionItem( $codeSequence, $key, $allData[$key], $item ); } if ( $used ) { -- 2.20.1