r97636: ParserCache meant to be committed already too

[lhc/web/wiklou.git] / includes / parser / ParserOptions.php

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index baf60ed..c545747 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -137,7 +137,7 @@ class ParserOptions {
        function setNumberHeadings( $x )            { return wfSetVar( $this->mNumberHeadings, $x ); }
        function setAllowSpecialInclusion( $x )     { return wfSetVar( $this->mAllowSpecialInclusion, $x ); }
        function setTidy( $x )                      { return wfSetVar( $this->mTidy, $x ); }
-       function setSkin( $x )                      { $this->mSkin = $x; }
+       function setSkin( $x )                      {}
        function setInterfaceMessage( $x )          { return wfSetVar( $this->mInterfaceMessage, $x ); }
        function setTargetLanguage( $x )            { return wfSetVar( $this->mTargetLanguage, $x, true ); }
        function setMaxIncludeSize( $x )            { return wfSetVar( $this->mMaxIncludeSize, $x ); }
@@ -275,11 +275,11 @@ class ParserOptions {
         *
         * @since 1.17
         * @param $forOptions Array
-        * @param $title Title: used to get the content language of the page
+        * @param $title Title: will be used to get the page content language
         * @return \string Page rendering hash
         */
        public function optionsHash( $forOptions, $title = null ) {
-               global $wgRenderHashAppend, $wgTitle;
+               global $wgContLang, $wgRenderHashAppend;
 
                $confstr = '';
 
@@ -323,12 +323,7 @@ class ParserOptions {
 
                // add in language specific options, if any
                // @todo FIXME: This is just a way of retrieving the url/user preferred variant
-               if( !is_null( $title ) ) {
-                       $confstr .= $title->getPageLanguage()->getExtraHashOptions();
-               } else {
-                       global $wgContLang;
-                       $confstr .= $wgContLang->getExtraHashOptions();
-               }
+               $confstr .= $wgContLang->getExtraHashOptions();
 
                $confstr .= $wgRenderHashAppend;