* Don't log patrol marking when not relevant
authorAaron Schulz <aaron@users.mediawiki.org>
Tue, 10 Jun 2008 00:51:40 +0000 (00:51 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Tue, 10 Jun 2008 00:51:40 +0000 (00:51 +0000)
* Use array_merge() for template ID array merge
* Some random refactoring

includes/OutputPage.php

index 0b2b6c5..75938a1 100644 (file)
@@ -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 )