Merge "OutputPage: addParserOutput*() family doesn't need to take a reference"

diff --combined includes/OutputPage.php
index f3b8c98,8a69f6c..6bc6595
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -1617,7 -1617,7 +1617,7 @@@ class OutputPage extends ContextSource 
         * @deprecated since 1.24, use addParserOutputMetadata() instead.
         * @param ParserOutput $parserOutput
         */
-       public function addParserOutputNoText( &$parserOutput ) {
+       public function addParserOutputNoText( $parserOutput ) {
                $this->addParserOutputMetadata( $parserOutput );
        }
  
@@@ -1629,7 -1629,7 +1629,7 @@@
         * @since 1.24
         * @param ParserOutput $parserOutput
         */
-       public function addParserOutputMetadata( &$parserOutput ) {
+       public function addParserOutputMetadata( $parserOutput ) {
                $this->mLanguageLinks += $parserOutput->getLanguageLinks();
                $this->addCategoryLinks( $parserOutput->getCategories() );
                $this->mNewSectionLink = $parserOutput->getNewSection();
@@@ -1685,7 -1685,7 +1685,7 @@@
         * @since 1.24
         * @param ParserOutput $parserOutput
         */
-       public function addParserOutputContent( &$parserOutput ) {
+       public function addParserOutputContent( $parserOutput ) {
                $this->addParserOutputText( $parserOutput );
  
                $this->addModules( $parserOutput->getModules() );
@@@ -1702,7 -1702,7 +1702,7 @@@
         * @since 1.24
         * @param ParserOutput $parserOutput
         */
-       public function addParserOutputText( &$parserOutput ) {
+       public function addParserOutputText( $parserOutput ) {
                $text = $parserOutput->getText();
                wfRunHooks( 'OutputPageBeforeHTML', array( &$this, &$text ) );
                $this->addHTML( $text );
@@@ -1713,7 -1713,7 +1713,7 @@@
         *
         * @param ParserOutput $parserOutput
         */
-       function addParserOutput( &$parserOutput ) {
+       function addParserOutput( $parserOutput ) {
                $this->addParserOutputMetadata( $parserOutput );
                $parserOutput->setTOCEnabled( $this->mEnableTOC );
  
@@@ -2679,7 -2679,7 +2679,7 @@@ $template
         */
        public function getResourceLoader() {
                if ( is_null( $this->mResourceLoader ) ) {
 -                      $this->mResourceLoader = new ResourceLoader();
 +                      $this->mResourceLoader = new ResourceLoader( $this->getConfig() );
                }
                return $this->mResourceLoader;
        }