Fixed mergeWith flags #36

oscarotero · oscarotero · commit d42707f2cfd6 · 2015-01-07T17:44:31.000+01:00
diff --git a/src/Translations.php b/src/Translations.php
@@ -212,7 +212,7 @@ public function mergeWith(Translations $translations, $method = null)
         }
 
         $add = (boolean) ($method & self::MERGE_ADD);
-        $references = (boolean) $method & (self::MERGE_REFERENCES);
+        $references = (boolean) ($method & self::MERGE_REFERENCES);
         $comments = (boolean) ($method & self::MERGE_COMMENTS);
 
         foreach ($translations as $entry) {

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public function mergeWith(Translations $translations, $method = null)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`$add = (boolean) ($method & self::MERGE_ADD);`
`215`		`- $references = (boolean) $method & (self::MERGE_REFERENCES);`
	`215`	`+ $references = (boolean) ($method & self::MERGE_REFERENCES);`
`216`	`216`	`$comments = (boolean) ($method & self::MERGE_COMMENTS);`
`217`	`217`
`218`	`218`	`foreach ($translations as $entry) {`