Merge "Deprecate the GetBlockedStatus hook"

diff --combined RELEASE-NOTES-1.34
index 2cebf99,c095697..b8c9102
--- 1/RELEASE-NOTES-1.34
--- 2/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@@ -190,34 -190,6 +190,34 @@@ because of Phabricator reports
    * CryptRand class
    * CryptRand service
    * Functions of the MWCryptRand class: singleton(), wasStrong() and generate().
 +* Various Special Page PHP Classes were renamed (mostly casing changes):
 +  * SpecialAncientpages => SpecialAncientPages
 +  * SpecialConfirmemail => SpecialConfirmEmail
 +  * SpecialDeadendpages => SpecialDeadendPages
 +  * SpecialFewestrevisions => SpecialFewestRevisions
 +  * SpecialListredirects => SpecialListRedirects
 +  * SpecialLonelypages => SpecialLonelyPages
 +  * SpecialLongpages => SpecialLongPages
 +  * SpecialMIMEsearch => SpecialMIMESearch
 +  * SpecialMostcategories => SpecialMostCategories
 +  * SpecialMostinterwikis => SpecialMostInterwikis
 +  * SpecialMostlinked => SpecialMostLinked
 +  * SpecialMostlinkedcategories => SpecialMostLinkedCategories
 +  * SpecialMostlinkedtemplates => SpecialMostLinkedTemplates
 +  * SpecialMostrevisions => SpecialMostRevisions
 +  * SpecialNewimages => SpecialNewFiles
 +  * SpecialShortpages => SpecialShortPages
 +  * SpecialUncategorizedcategories => SpecialUncategorizedCategories
 +  * SpecialUncategorizedimages => SpecialUncategorizedImages
 +  * SpecialUncategorizedpages => SpecialUncategorizedPages
 +  * SpecialUncategorizedtemplates => SpecialUncategorizedTemplates
 +  * SpecialUnusedcategories => SpecialUnusedCategories
 +  * SpecialUnusedimages => SpecialUnusedImages
 +  * SpecialUnusedtemplates => SpecialUnusedTemplates
 +  * SpecialUnwatchedpages => SpecialUnwatchedPages
 +  * SpecialWantedcategories => SpecialWantedCategories
 +  * SpecialWantedtemplates => SpecialWantedTemplates
 +  * SpecialWithoutinterwiki => SpecialWithoutInterwiki
  * Language::setCode, deprecated in 1.32, was removed. Use Language::factory to
    create a new Language object with a different language code.
  * MWNamespace::clearCaches() has been removed.  So has the $rebuild parameter
@@@ -560,6 -532,8 +560,8 @@@
    be used instead.
  * The UserIsHidden hook is deprecated. Use GetUserBlock instead, and add a
    system block that hides the user.
+ * The GetBlockedStatus hook is deprecated. Use GetUserBlock instead, to add or
+   remove a block.
  
  === Other changes in 1.34 ===
  * …

diff --combined includes/user/User.php
index 3e84b0b,7ec3ff5..4445e1d
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -1741,7 -1741,7 +1741,7 @@@ class User implements IDBAccessObject, 
                // Avoid PHP 7.1 warning of passing $this by reference
                $thisUser = $this;
                // Extensions
-               Hooks::run( 'GetBlockedStatus', [ &$thisUser ] );
+               Hooks::run( 'GetBlockedStatus', [ &$thisUser ], '1.34' );
        }
  
        /**
@@@ -3717,7 -3717,7 +3717,7 @@@
  
                                // If there is a new, unseen, revision, use its timestamp
                                $nextid = $oldid
 -                                      ? $title->getNextRevisionID( $oldid, Title::GAID_FOR_UPDATE )
 +                                      ? $title->getNextRevisionID( $oldid, Title::READ_LATEST )
                                        : null;
                                if ( $nextid ) {
                                        $this->setNewtalk( true, Revision::newFromId( $nextid ) );