diff --git a/RELEASE-NOTES-1.35 b/RELEASE-NOTES-1.35 index b453b76abf4..722548dc42e 100644 --- a/RELEASE-NOTES-1.35 +++ b/RELEASE-NOTES-1.35 @@ -98,6 +98,8 @@ because of Phabricator reports. ApiBlockInfoTrait::getBlockDetails instead. * The mediawiki.ui.text module, deprecated in 1.28 and unused, was removed. * AbstractBlock::mReason, deprecated in 1.34, is no longer public. +* The GetBlockedStatus, deprecated in 1.34, has been removed. Instead, use the + GetUserBlock hook. * … === Deprecations in 1.35 === diff --git a/docs/hooks.txt b/docs/hooks.txt index a6d6c6c08ef..789b7106d73 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1585,10 +1585,6 @@ entitled to be in. $user: user to promote. &$promote: groups that will be added. -'GetBlockedStatus': DEPRECATED since 1.34 - use GetUserBlock instead. After -loading blocking status of a user from the database -&$user: user (object) being checked - 'GetCacheVaryCookies': Get cookies that should vary cache options. $out: OutputPage object &$cookies: array of cookies name, add a value to it if you want to add a cookie diff --git a/includes/user/User.php b/includes/user/User.php index 78e2d2e9781..de5d2884317 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -1760,11 +1760,6 @@ class User implements IDBAccessObject, UserIdentity { $this->mHideName = 0; $this->mAllowUsertalk = false; } - - // Avoid PHP 7.1 warning of passing $this by reference - $thisUser = $this; - // Extensions - Hooks::run( 'GetBlockedStatus', [ &$thisUser ], '1.34' ); } /**