Merge "Use array_merge() for OutputPage::$mLanguageLinks, not +"

diff --combined includes/OutputPage.php
index 2e091f1,25571a6..1dc996a
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -403,6 -403,18 +403,6 @@@ class OutputPage extends ContextSource 
                return $this->mLinktags;
        }
  
 -      /**
 -       * Add a new \<link\> with "rel" attribute set to "meta"
 -       *
 -       * @param array $linkarr Associative array mapping attribute names to their
 -       *                 values, both keys and values will be escaped, and the
 -       *                 "rel" attribute will be automatically added
 -       */
 -      function addMetadataLink( array $linkarr ) {
 -              $linkarr['rel'] = $this->getMetadataAttribute();
 -              $this->addLink( $linkarr );
 -      }
 -
        /**
         * Set the URL to be used for the <link rel=canonical>. This should be used
         * in preference to addLink(), to avoid duplicate link tags.
@@@ -423,6 -435,22 +423,6 @@@
                return $this->mCanonicalUrl;
        }
  
 -      /**
 -       * Get the value of the "rel" attribute for metadata links
 -       *
 -       * @return string
 -       */
 -      public function getMetadataAttribute() {
 -              # note: buggy CC software only reads first "meta" link
 -              static $haveMeta = false;
 -              if ( $haveMeta ) {
 -                      return 'alternate meta';
 -              } else {
 -                      $haveMeta = true;
 -                      return 'meta';
 -              }
 -      }
 -
        /**
         * Add raw HTML to the list of scripts (including \<script\> tag, etc.)
         * Internal use only. Use OutputPage::addModules() or OutputPage::addJsConfigVars()
@@@ -1234,7 -1262,7 +1234,7 @@@
         *                               (e.g. 'fr:Test page')
         */
        public function addLanguageLinks( array $newLinkArray ) {
-               $this->mLanguageLinks += $newLinkArray;
+               $this->mLanguageLinks = array_merge( $this->mLanguageLinks, $newLinkArray );
        }
  
        /**
@@@ -1772,7 -1800,8 +1772,8 @@@
         * @param ParserOutput $parserOutput
         */
        public function addParserOutputMetadata( $parserOutput ) {
-               $this->mLanguageLinks += $parserOutput->getLanguageLinks();
+               $this->mLanguageLinks =
+                       array_merge( $this->mLanguageLinks, $parserOutput->getLanguageLinks() );
                $this->addCategoryLinks( $parserOutput->getCategories() );
                $this->setIndicators( $parserOutput->getIndicators() );
                $this->mNewSectionLink = $parserOutput->getNewSection();