X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fparser%2FParserOptions.php;h=c545747d4ee38beee5e52b08ed9e1a0d5b878a99;hb=4f0d60606965e3ee284375c5063e4ca792417c11;hp=c97502186ba519d60dab728654e344c2e6c52e64;hpb=7d98280f3e8bbf94653bb19c27de20438dc835b8;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index c97502186b..c545747d4e 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -18,7 +18,6 @@ class ParserOptions { var $mAllowExternalImages; # Allow external images inline var $mAllowExternalImagesFrom; # If not, any exception? var $mEnableImageWhitelist; # If not or it doesn't match, should we check an on-wiki whitelist? - var $mSkin = null; # Reference to the preferred skin var $mDateFormat = null; # Date format index var $mEditSection = true; # Create "edit section" links var $mAllowSpecialInclusion; # Allow inclusion of special pages @@ -41,6 +40,7 @@ class ParserOptions { var $mNumberHeadings; # Automatically number headings var $mMath; # User math preference (as integer) var $mThumbSize; # Thumb size preferred by the user. + private $mStubThreshold; # Maximum article size of an article to be marked as "stub" var $mUserLang; # Language code of the User language. /** @@ -61,7 +61,7 @@ class ParserOptions { function getAllowExternalImagesFrom() { return $this->mAllowExternalImagesFrom; } function getEnableImageWhitelist() { return $this->mEnableImageWhitelist; } function getEditSection() { return $this->mEditSection; } - function getNumberHeadings() { $this->optionUsed('numberheadings'); + function getNumberHeadings() { $this->optionUsed( 'numberheadings' ); return $this->mNumberHeadings; } function getAllowSpecialInclusion() { return $this->mAllowSpecialInclusion; } function getTidy() { return $this->mTidy; } @@ -76,27 +76,32 @@ class ParserOptions { function getEnableLimitReport() { return $this->mEnableLimitReport; } function getCleanSignatures() { return $this->mCleanSignatures; } function getExternalLinkTarget() { return $this->mExternalLinkTarget; } - function getMath() { $this->optionUsed('math'); + function getMath() { $this->optionUsed( 'math' ); return $this->mMath; } - function getThumbSize() { $this->optionUsed('thumbsize'); + function getThumbSize() { $this->optionUsed( 'thumbsize' ); return $this->mThumbSize; } + function getStubThreshold() { $this->optionUsed( 'stubthreshold' ); + return $this->mStubThreshold; } function getIsPreview() { return $this->mIsPreview; } function getIsSectionPreview() { return $this->mIsSectionPreview; } - function getIsPrintable() { $this->optionUsed('printable'); + function getIsPrintable() { $this->optionUsed( 'printable' ); return $this->mIsPrintable; } function getUser() { return $this->mUser; } function getPreSaveTransform() { return $this->mPreSaveTransform; } + /** + * @param $title Title + * @return Skin + * @deprecated since 1.18 Use Linker::* instead + */ function getSkin( $title = null ) { - if ( !isset( $this->mSkin ) ) { - $this->mSkin = $this->mUser->getSkin( $title ); - } - return $this->mSkin; + wfDeprecated( __METHOD__ ); + return new DummyLinker; } function getDateFormat() { - $this->optionUsed('dateformat'); + $this->optionUsed( 'dateformat' ); if ( !isset( $this->mDateFormat ) ) { $this->mDateFormat = $this->mUser->getDatePreference(); } @@ -114,9 +119,11 @@ class ParserOptions { * You shouldn't use this. Really. $parser->getFunctionLang() is all you need. * Using this fragments the cache and is discouraged. Yes, {{int: }} uses this, * producing inconsistent tables (Bug 14404). + * @return String Language code + * @since 1.17 */ function getUserLang() { - $this->optionUsed('userlang'); + $this->optionUsed( 'userlang' ); return $this->mUserLang; } @@ -129,10 +136,10 @@ class ParserOptions { function setEditSection( $x ) { return wfSetVar( $this->mEditSection, $x ); } 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 setInterfaceMessage( $x ) { return wfSetVar( $this->mInterfaceMessage, $x); } - function setTargetLanguage( $x ) { return wfSetVar( $this->mTargetLanguage, $x); } + function setTidy( $x ) { return wfSetVar( $this->mTidy, $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 ); } function setMaxPPNodeCount( $x ) { return wfSetVar( $this->mMaxPPNodeCount, $x ); } function setMaxTemplateDepth( $x ) { return wfSetVar( $this->mMaxTemplateDepth, $x ); } @@ -143,8 +150,14 @@ class ParserOptions { function setCleanSignatures( $x ) { return wfSetVar( $this->mCleanSignatures, $x ); } function setExternalLinkTarget( $x ) { return wfSetVar( $this->mExternalLinkTarget, $x ); } function setMath( $x ) { return wfSetVar( $this->mMath, $x ); } - function setUserLang( $x ) { return wfSetVar( $this->mUserLang, $x ); } + function setUserLang( $x ) { + if ( $x instanceof Language ) { + $x = $x->getCode(); + } + return wfSetVar( $this->mUserLang, $x ); + } function setThumbSize( $x ) { return wfSetVar( $this->mThumbSize, $x ); } + function setStubThreshold( $x ) { return wfSetVar( $this->mStubThreshold, $x ); } function setPreSaveTransform( $x ) { return wfSetVar( $this->mPreSaveTransform, $x ); } function setIsPreview( $x ) { return wfSetVar( $this->mIsPreview, $x ); } @@ -210,6 +223,7 @@ class ParserOptions { $this->mNumberHeadings = $user->getOption( 'numberheadings' ); $this->mMath = $user->getOption( 'math' ); $this->mThumbSize = $user->getOption( 'thumbsize' ); + $this->mStubThreshold = $user->getStubThreshold(); $this->mUserLang = $wgLang->getCode(); wfProfileOut( __METHOD__ ); @@ -260,54 +274,57 @@ class ParserOptions { * settings. * * @since 1.17 + * @param $forOptions Array + * @param $title Title: will be used to get the page content language * @return \string Page rendering hash */ - public function optionsHash( $forOptions ) { + public function optionsHash( $forOptions, $title = null ) { global $wgContLang, $wgRenderHashAppend; $confstr = ''; - if ( in_array( 'math', $forOptions ) ) + if ( in_array( 'math', $forOptions ) ) { $confstr .= $this->mMath; - else + } else { $confstr .= '*'; + } // Space assigned for the stubthreshold but unused // since it disables the parser cache, its value will always // be 0 when this function is called by parsercache. - // The conditional is here to avoid a confusing 0 - if ( true || in_array( 'stubthreshold', $forOptions ) ) - $confstr .= '!0' ; - else + if ( in_array( 'stubthreshold', $forOptions ) ) { + $confstr .= '!' . $this->mStubThreshold; + } else { $confstr .= '!*' ; + } - if ( in_array( 'dateformat', $forOptions ) ) + if ( in_array( 'dateformat', $forOptions ) ) { $confstr .= '!' . $this->getDateFormat(); + } - if ( in_array( 'numberheadings', $forOptions ) ) + if ( in_array( 'numberheadings', $forOptions ) ) { $confstr .= '!' . ( $this->mNumberHeadings ? '1' : '' ); - else + } else { $confstr .= '!*'; + } - if ( in_array( 'userlang', $forOptions ) ) + if ( in_array( 'userlang', $forOptions ) ) { $confstr .= '!' . $this->mUserLang; - else + } else { $confstr .= '!*'; + } - if ( in_array( 'thumbsize', $forOptions ) ) + if ( in_array( 'thumbsize', $forOptions ) ) { $confstr .= '!' . $this->mThumbSize; - else + } else { $confstr .= '!*'; + } // add in language specific options, if any - // FIXME: This is just a way of retrieving the url/user preferred variant + // @todo FIXME: This is just a way of retrieving the url/user preferred variant $confstr .= $wgContLang->getExtraHashOptions(); - // Since the skin could be overloading link(), it should be - // included here but in practice, none of our skins do that. - // $confstr .= "!" . $this->mSkin->getSkinName(); - $confstr .= $wgRenderHashAppend; if ( !in_array( 'editsection', $forOptions ) ) { @@ -315,9 +332,10 @@ class ParserOptions { } elseif ( !$this->mEditSection ) { $confstr .= '!edit=0'; } - - if ( $this->mIsPrintable && in_array( 'printable', $forOptions ) ) + + if ( $this->mIsPrintable && in_array( 'printable', $forOptions ) ) { $confstr .= '!printable=1'; + } if ( $this->mExtraKey != '' ) $confstr .= $this->mExtraKey;