From 3aa33b62eed9e22a26bbd49b1d98c5be2499419c Mon Sep 17 00:00:00 2001 From: aude Date: Fri, 22 Nov 2013 08:17:22 +0000 Subject: [PATCH] Remove User::getPageRenderingHash, deprecated since 1.17 The function is not used in core or in any extension in git, and the PageRenderingHash hook in User::getPageRenderingHash is not used in any extension. (note the hook still exists in ParserOptions). Change-Id: Ica27ce3828dd6551e21671ff723427d09c2dcadb --- RELEASE-NOTES-1.23 | 1 + includes/User.php | 50 ------------------------------- includes/parser/ParserOptions.php | 2 -- 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 89b27ad06f..119a30c28e 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -86,6 +86,7 @@ changes to languages because of Bugzilla reports. * The global variable $wgArticle has been removed after a lengthy deprecation. * The global functions addButton and insertTags (for mw.toolbar.addButton and mw.toolbar.insertTags) now emits mw.log.warn when accessed. +* User::getPageRenderingHash() was deprecated since 1.17 and has been removed. == Compatibility == diff --git a/includes/User.php b/includes/User.php index 224626b928..a01444a1a9 100644 --- a/includes/User.php +++ b/includes/User.php @@ -3513,56 +3513,6 @@ class User { return (bool)$userblock->doAutoblock( $this->getRequest()->getIP() ); } - /** - * Generate a string which will be different for any combination of - * user options which would produce different parser output. - * This will be used as part of the hash key for the parser cache, - * so users with the same options can share the same cached data - * safely. - * - * Extensions which require it should install 'PageRenderingHash' hook, - * which will give them a chance to modify this key based on their own - * settings. - * - * @deprecated since 1.17 use the ParserOptions object to get the relevant options - * @return string Page rendering hash - */ - public function getPageRenderingHash() { - wfDeprecated( __METHOD__, '1.17' ); - - global $wgRenderHashAppend, $wgLang, $wgContLang; - if ( $this->mHash ) { - return $this->mHash; - } - - // stubthreshold is only included below for completeness, - // since it disables the parser cache, its value will always - // be 0 when this function is called by parsercache. - - $confstr = $this->getOption( 'math' ); - $confstr .= '!' . $this->getStubThreshold(); - $confstr .= '!' . ( $this->getOption( 'numberheadings' ) ? '1' : '' ); - $confstr .= '!' . $wgLang->getCode(); - $confstr .= '!' . $this->getOption( 'thumbsize' ); - // add in language specific options, if any - $extra = $wgContLang->getExtraHashOptions(); - $confstr .= $extra; - - // Since the skin could be overloading link(), it should be - // included here but in practice, none of our skins do that. - - $confstr .= $wgRenderHashAppend; - - // Give a chance for extensions to modify the hash, if they have - // extra options or other effects on the parser cache. - wfRunHooks( 'PageRenderingHash', array( &$confstr ) ); - - // Make it a valid memcached key fragment - $confstr = str_replace( ' ', '_', $confstr ); - $this->mHash = $confstr; - return $confstr; - } - /** * Get whether the user is explicitly blocked from account creation. * @return bool|Block diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index e12f32d841..8393216875 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -493,8 +493,6 @@ class ParserOptions { * so users sharign the options with vary for the same page share * the same cached data safely. * - * Replaces User::getPageRenderingHash() - * * Extensions which require it should install 'PageRenderingHash' hook, * which will give them a chance to modify this key based on their own * settings. -- 2.20.1