Merge "OutputPage: Set wgPageContentLanguage to pageViewLang instead of pageLang"

diff --combined includes/OutputPage.php
index 305359f,e36d83f..6774072
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -519,6 -519,17 +519,6 @@@ class OutputPage extends ContextSource 
                $this->mScripts .= Html::inlineScript( "\n$script\n" ) . "\n";
        }
  
 -      /**
 -       * Get all registered JS and CSS tags for the header.
 -       *
 -       * @return string
 -       * @deprecated since 1.24 Use OutputPage::headElement to build the full header.
 -       */
 -      function getScript() {
 -              wfDeprecated( __METHOD__, '1.24' );
 -              return $this->mScripts . $this->getHeadItems();
 -      }
 -
        /**
         * Filter an array of modules to remove insufficiently trustworthy members, and modules
         * which are no longer registered (eg a page is cached before an extension is disabled)
@@@ -667,6 -678,22 +667,6 @@@
                return $this->mHeadItems;
        }
  
 -      /**
 -       * Get all header items in a string
 -       *
 -       * @return string
 -       * @deprecated since 1.24 Use OutputPage::headElement or
 -       *   if absolutely necessary use OutputPage::getHeadItemsArray
 -       */
 -      function getHeadItems() {
 -              wfDeprecated( __METHOD__, '1.24' );
 -              $s = '';
 -              foreach ( $this->mHeadItems as $item ) {
 -                      $s .= $item;
 -              }
 -              return $s;
 -      }
 -
        /**
         * Add or replace an header item to the output
         *
@@@ -1468,6 -1495,19 +1468,6 @@@
                }
        }
  
 -      /**
 -       * Set the highest level of CSS/JS untrustworthiness allowed
 -       *
 -       * @deprecated since 1.24 Raising level of allowed untrusted content is no longer supported.
 -       *  Use reduceAllowedModules() instead
 -       * @param string $type ResourceLoaderModule TYPE_ constant
 -       * @param int $level ResourceLoaderModule class constant
 -       */
 -      public function setAllowedModules( $type, $level ) {
 -              wfDeprecated( __METHOD__, '1.24' );
 -              $this->reduceAllowedModules( $type, $level );
 -      }
 -
        /**
         * Limit the highest level of CSS/JS untrustworthiness allowed.
         *
@@@ -2327,6 -2367,17 +2327,6 @@@
  
        }
  
 -      /**
 -       * Actually output something with print.
 -       *
 -       * @param string $ins The string to output
 -       * @deprecated since 1.22 Use echo yourself.
 -       */
 -      public function out( $ins ) {
 -              wfDeprecated( __METHOD__, '1.22' );
 -              print $ins;
 -      }
 -
        /**
         * Prepare this object to display an error page; disable caching and
         * indexing, clear the current text and redirect, set the page's title
@@@ -3167,7 -3218,7 +3167,7 @@@
                        $articleId = $wikiPage->getId();
                }
  
-               $lang = $title->getPageLanguage();
+               $lang = $title->getPageViewLanguage();
  
                // Pre-process information
                $separatorTransTable = $lang->separatorTransformTable();