From 299229f4ea4cff5f37c81c85be561da4f086808e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 10 Jun 2008 00:51:40 +0000 Subject: [PATCH] * Don't log patrol marking when not relevant * Use array_merge() for template ID array merge * Some random refactoring --- includes/OutputPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) -- 2.20.1