From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 10 Jun 2008 01:25:41 +0000 (+0000)
Subject: Use nice wfArrayMerge(), rather than piece of shit PHP function that fucks up the... 
X-Git-Tag: 1.31.0-rc.0~47081
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=5b89d7869566f78d0a62f770340850df0fe75c8f;p=lhc%2Fweb%2Fwiklou.git

Use nice wfArrayMerge(), rather than piece of shit PHP function that fucks up the result. I was wondering wtf was going on...
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 75938a1f9b..351b2b429e 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_merge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds );
+		$this->mTemplateIds = wfArrayMerge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds );
 
 		// Display title
 		if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )