Merge "Pass the result of the database queries in Title::getPreviousRevisionID()...

diff --combined includes/Title.php
index 15945f8,2748651..3140f02
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -181,12 -181,13 +181,12 @@@ class Title 
         * @return Title the new object, or NULL on an error
         */
        public static function newFromURL( $url ) {
 -              global $wgLegalTitleChars;
                $t = new Title();
  
                # For compatibility with old buggy URLs. "+" is usually not valid in titles,
                # but some URLs used it as a space replacement and they still come
                # from some external search tools.
 -              if ( strpos( $wgLegalTitleChars, '+' ) === false ) {
 +              if ( strpos( self::legalChars(), '+' ) === false ) {
                        $url = str_replace( '+', ' ', $url );
                }
  
@@@ -3918,7 -3919,7 +3918,7 @@@
         */
        public function getPreviousRevisionID( $revId, $flags = 0 ) {
                $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
-               return $db->selectField( 'revision', 'rev_id',
+               $revId = $db->selectField( 'revision', 'rev_id',
                        array(
                                'rev_page' => $this->getArticleID( $flags ),
                                'rev_id < ' . intval( $revId )
@@@ -3926,6 -3927,12 +3926,12 @@@
                        __METHOD__,
                        array( 'ORDER BY' => 'rev_id DESC' )
                );
+ 
+               if ( $revId === false ) {
+                       return false;
+               } else {
+                       return intval( $revId );
+               }
        }
  
        /**
@@@ -3937,7 -3944,7 +3943,7 @@@
         */
        public function getNextRevisionID( $revId, $flags = 0 ) {
                $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
-               return $db->selectField( 'revision', 'rev_id',
+               $revId = $db->selectField( 'revision', 'rev_id',
                        array(
                                'rev_page' => $this->getArticleID( $flags ),
                                'rev_id > ' . intval( $revId )
@@@ -3945,6 -3952,12 +3951,12 @@@
                        __METHOD__,
                        array( 'ORDER BY' => 'rev_id' )
                );
+ 
+               if ( $revId === false ) {
+                       return false;
+               } else {
+                       return intval( $revId );
+               }
        }
  
        /**
@@@ -4317,10 -4330,9 +4329,10 @@@
                $dbr = wfGetDB( DB_SLAVE );
                $this->mNotificationTimestamp[$uid] = $dbr->selectField( 'watchlist',
                        'wl_notificationtimestamp',
 -                      array( 'wl_namespace' => $this->getNamespace(),
 +                      array(
 +                              'wl_user' => $user->getId(),
 +                              'wl_namespace' => $this->getNamespace(),
                                'wl_title' => $this->getDBkey(),
 -                              'wl_user' => $user->getId()
                        ),
                        __METHOD__
                );