From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 10 Jun 2008 00:51:40 +0000 (+0000)
Subject: * Don't log patrol marking when not relevant
X-Git-Tag: 1.31.0-rc.0~47083
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=299229f4ea4cff5f37c81c85be561da4f086808e;p=lhc%2Fweb%2Fwiklou.git

* Don't log patrol marking when not relevant
* Use array_merge() for template ID array merge
* Some random refactoring
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 0b2b6c5db3..75938a1f9b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -424,7 +424,7 @@ class OutputPage {
 		$this->mNoGallery = $parserOutput->getNoGallery();
 		$this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems );
 		// Versioning...
-		$this->mTemplateIds += (array)$parserOutput->mTemplateIds;
+		$this->mTemplateIds = array_merge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds );
 
 		// Display title
 		if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )