From: Victor Vasiliev <vasilievvv@users.mediawiki.org>
Date: Thu, 2 Jul 2009 12:59:04 +0000 (+0000)
Subject: Replace || with |, so messages get merged regardless of $used value
X-Git-Tag: 1.31.0-rc.0~41132
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=94f09907d0d35f28a6799fba75c36b45f8a2ade3;p=lhc%2Fweb%2Fwiklou.git

Replace || with |, so messages get merged regardless of $used value
---

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 ) {