Merge "Remove deprecated Title::userIsWatching"

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index d344114..1355b4d 100644 (file)
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -215,6 +215,7 @@ changes to languages because of Phabricator reports.
 * ChangesList::usePatrol was removed (deprecated since 1.22).
 * wfMsgNoTrans() was removed (deprecated since 1.18).
 * Linker::makeImageLink2 was removed (deprecated since 1.20).
+* Title::userIsWatching() was removed (deprecated since 1.20).
 
 == Compatibility ==
 

diff --git a/includes/Title.php b/includes/Title.php
index 35d9c6b..3f880f5 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -130,12 +130,6 @@ class Title {
         */
        public $mDefaultNamespace = NS_MAIN;
 
-       /**
-        * @var bool Is $wgUser watching this page? null if unfilled, accessed
-        * through userIsWatching()
-        */
-       protected $mWatched = null;
-
        /** @var int The page length, 0 for special pages */
        protected $mLength = -1;
 
@@ -1875,25 +1869,6 @@ class Title {
                return $s;
        }
 
-       /**
-        * Is $wgUser watching this page?
-        *
-        * @deprecated since 1.20; use User::isWatched() instead.
-        * @return bool
-        */
-       public function userIsWatching() {
-               global $wgUser;
-
-               if ( is_null( $this->mWatched ) ) {
-                       if ( NS_SPECIAL == $this->mNamespace || !$wgUser->isLoggedIn() ) {
-                               $this->mWatched = false;
-                       } else {
-                               $this->mWatched = $wgUser->isWatched( $this );
-                       }
-               }
-               return $this->mWatched;
-       }
-
        /**
         * Can $user perform $action on this page?
         * This skips potentially expensive cascading permission checks