Add support for Number grouping(commafy) based on CLDR number grouping patterns like...
[lhc/web/wiklou.git] / includes / Revision.php
index 93c1120..243c9c0 100644 (file)
@@ -1,8 +1,4 @@
 <?php
-/**
- * @todo document
- * @file
- */
 
 /**
  * @todo document
@@ -23,14 +19,13 @@ class Revision {
         * Load a page revision from a given revision ID number.
         * Returns null if no such revision can be found.
         *
-        * @param int $id
-        * @access public
-        * @static
+        * @param $id Integer
+        * @return Revision or null
         */
        public static function newFromId( $id ) {
                return Revision::newFromConds(
                        array( 'page_id=rev_page',
-                              'rev_id' => intval( $id ) ) );
+                                  'rev_id' => intval( $id ) ) );
        }
 
        /**
@@ -38,14 +33,14 @@ class Revision {
         * that's attached to a given title. If not attached
         * to that title, will return null.
         *
-        * @param Title $title
-        * @param int $id
-        * @return Revision
+        * @param $title Title
+        * @param $id Integer (optional)
+        * @return Revision or null
         */
        public static function newFromTitle( $title, $id = 0 ) {
-               $conds = array( 
-                       'page_namespace' => $title->getNamespace(), 
-                       'page_title' => $title->getDBkey()
+               $conds = array(
+                       'page_namespace' => $title->getNamespace(),
+                       'page_title'     => $title->getDBkey()
                );
                if ( $id ) {
                        // Use the specified ID
@@ -55,8 +50,7 @@ class Revision {
                        $dbw = wfGetDB( DB_MASTER );
                        $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
                        if ( $latest === false ) {
-                               // Page does not exist
-                               return null;
+                               return null; // page does not exist
                        }
                        $conds['rev_id'] = $latest;
                } else {
@@ -67,14 +61,47 @@ class Revision {
                return Revision::newFromConds( $conds );
        }
 
+       /**
+        * Load either the current, or a specified, revision
+        * that's attached to a given page ID.
+        * Returns null if no such revision can be found.
+        *
+        * @param $revId Integer
+        * @param $pageId Integer (optional)
+        * @return Revision or null
+        */
+       public static function newFromPageId( $pageId, $revId = 0 ) {
+               $conds = array( 'page_id' => $pageId );
+               if ( $revId ) {
+                       $conds['rev_id'] = $revId;
+               } elseif ( wfGetLB()->getServerCount() > 1 ) {
+                       // Get the latest revision ID from the master
+                       $dbw = wfGetDB( DB_MASTER );
+                       $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
+                       if ( $latest === false ) {
+                               return null; // page does not exist
+                       }
+                       $conds['rev_id'] = $latest;
+               } else {
+                       $conds[] = 'rev_id = page_latest';
+               }
+               $conds[] = 'page_id=rev_page';
+               return Revision::newFromConds( $conds );
+       }
+
        /**
         * Make a fake revision object from an archive table row. This is queried
         * for permissions or even inserted (as in Special:Undelete)
-        * @fixme: should be a subclass for RevisionDelete. [TS]
+        * @todo FIXME: Should be a subclass for RevisionDelete. [TS]
+        *
+        * @param $row
+        * @param $overrides array
+        *
+        * @return Revision
         */
        public static function newFromArchiveRow( $row, $overrides = array() ) {
                $attribs = $overrides + array(
-                       'page'       => isset( $row->page_id ) ? $row->page_id : null,
+                       'page'       => isset( $row->ar_page_id ) ? $row->ar_page_id : null,
                        'id'         => isset( $row->ar_rev_id ) ? $row->ar_rev_id : null,
                        'comment'    => $row->ar_comment,
                        'user'       => $row->ar_user,
@@ -87,23 +114,35 @@ class Revision {
                if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
                        // Pre-1.5 ar_text row
                        $attribs['text'] = self::getRevisionText( $row, 'ar_' );
+                       if ( $attribs['text'] === false ) {
+                               throw new MWException( 'Unable to load text from archive row (possibly bug 22624)' );
+                       }
                }
                return new self( $attribs );
        }
 
+       /**
+        * @since 1.19
+        *
+        * @param $row
+        * @return Revision
+        */
+       public static function newFromRow( $row ) {
+               return new self( $row );
+       }
+
        /**
         * Load a page revision from a given revision ID number.
         * Returns null if no such revision can be found.
         *
-        * @param Database $db
-        * @param int $id
-        * @access public
-        * @static
+        * @param $db DatabaseBase
+        * @param $id Integer
+        * @return Revision or null
         */
        public static function loadFromId( $db, $id ) {
                return Revision::loadFromConds( $db,
                        array( 'page_id=rev_page',
-                              'rev_id' => intval( $id ) ) );
+                                  'rev_id' => intval( $id ) ) );
        }
 
        /**
@@ -111,12 +150,10 @@ class Revision {
         * that's attached to a given page. If not attached
         * to that page, will return null.
         *
-        * @param Database $db
-        * @param int $pageid
-        * @param int $id
-        * @return Revision
-        * @access public
-        * @static
+        * @param $db DatabaseBase
+        * @param $pageid Integer
+        * @param $id Integer
+        * @return Revision or null
         */
        public static function loadFromPageId( $db, $pageid, $id = 0 ) {
                $conds = array( 'page_id=rev_page','rev_page' => intval( $pageid ), 'page_id'=>intval( $pageid ) );
@@ -128,17 +165,39 @@ class Revision {
                return Revision::loadFromConds( $db, $conds );
        }
 
+       /**
+        * Stores the origin wiki of a revision in case it is a foreign wiki
+        */
+       function setWikiID( $wikiID ) {
+               $this->mWikiID = $wikiID;
+       }
+
+       /**
+        * Load the current revision of a given page of a foreign wiki.
+        * The WikiID is stored for further use, such as loadText() and getTimestampFromId()
+        */
+       public static function loadFromTitleForeignWiki( $wikiID, $title ) {
+               $dbr = wfGetDB( DB_SLAVE, array(), $wikiID );
+
+               $revision = self::loadFromTitle( $dbr, $title );
+
+               if( $revision ) {
+                       $revision->setWikiID( $wikiID );
+               }
+
+               return $revision;
+
+       }
+
        /**
         * Load either the current, or a specified, revision
         * that's attached to a given page. If not attached
         * to that page, will return null.
         *
-        * @param Database $db
-        * @param Title $title
-        * @param int $id
-        * @return Revision
-        * @access public
-        * @static
+        * @param $db DatabaseBase
+        * @param $title Title
+        * @param $id Integer
+        * @return Revision or null
         */
        public static function loadFromTitle( $db, $title, $id = 0 ) {
                if( $id ) {
@@ -149,9 +208,9 @@ class Revision {
                return Revision::loadFromConds(
                        $db,
                        array( "rev_id=$matchId",
-                              'page_id=rev_page',
-                              'page_namespace' => $title->getNamespace(),
-                              'page_title'     => $title->getDBkey() ) );
+                                  'page_id=rev_page',
+                                  'page_namespace' => $title->getNamespace(),
+                                  'page_title'     => $title->getDBkey() ) );
        }
 
        /**
@@ -159,29 +218,25 @@ class Revision {
         * WARNING: Timestamps may in some circumstances not be unique,
         * so this isn't the best key to use.
         *
-        * @param Database $db
-        * @param Title $title
-        * @param string $timestamp
-        * @return Revision
-        * @access public
-        * @static
+        * @param $db DatabaseBase
+        * @param $title Title
+        * @param $timestamp String
+        * @return Revision or null
         */
        public static function loadFromTimestamp( $db, $title, $timestamp ) {
                return Revision::loadFromConds(
                        $db,
                        array( 'rev_timestamp'  => $db->timestamp( $timestamp ),
-                              'page_id=rev_page',
-                              'page_namespace' => $title->getNamespace(),
-                              'page_title'     => $title->getDBkey() ) );
+                                  'page_id=rev_page',
+                                  'page_namespace' => $title->getNamespace(),
+                                  'page_title'     => $title->getDBkey() ) );
        }
 
        /**
         * Given a set of conditions, fetch a revision.
         *
-        * @param array $conditions
-        * @return Revision
-        * @access private
-        * @static
+        * @param $conditions Array
+        * @return Revision or null
         */
        public static function newFromConds( $conditions ) {
                $db = wfGetDB( DB_SLAVE );
@@ -197,11 +252,9 @@ class Revision {
         * Given a set of conditions, fetch a revision from
         * the given database connection.
         *
-        * @param Database $db
-        * @param array $conditions
-        * @return Revision
-        * @access private
-        * @static
+        * @param $db DatabaseBase
+        * @param $conditions Array
+        * @return Revision or null
         */
        private static function loadFromConds( $db, $conditions ) {
                $res = Revision::fetchFromConds( $db, $conditions );
@@ -222,18 +275,16 @@ class Revision {
         * fetch all of a given page's revisions in turn.
         * Each row can be fed to the constructor to get objects.
         *
-        * @param Title $title
+        * @param $title Title
         * @return ResultWrapper
-        * @access public
-        * @static
         */
        public static function fetchRevision( $title ) {
                return Revision::fetchFromConds(
                        wfGetDB( DB_SLAVE ),
                        array( 'rev_id=page_latest',
-                              'page_namespace' => $title->getNamespace(),
-                              'page_title'     => $title->getDBkey(),
-                              'page_id=rev_page' ) );
+                                  'page_namespace' => $title->getNamespace(),
+                                  'page_title'     => $title->getDBkey(),
+                                  'page_id=rev_page' ) );
        }
 
        /**
@@ -241,32 +292,28 @@ class Revision {
         * which will return matching database rows with the
         * fields necessary to build Revision objects.
         *
-        * @param Database $db
-        * @param array $conditions
+        * @param $db DatabaseBase
+        * @param $conditions Array
         * @return ResultWrapper
-        * @access private
-        * @static
         */
        private static function fetchFromConds( $db, $conditions ) {
                $fields = self::selectFields();
                $fields[] = 'page_namespace';
                $fields[] = 'page_title';
                $fields[] = 'page_latest';
-               $res = $db->select(
+               return $db->select(
                        array( 'page', 'revision' ),
                        $fields,
                        $conditions,
                        __METHOD__,
                        array( 'LIMIT' => 1 ) );
-               $ret = $db->resultObject( $res );
-               return $ret;
        }
 
        /**
         * Return the list of revision fields that should be selected to create
         * a new revision.
         */
-       static function selectFields() {
+       public static function selectFields() {
                return array(
                        'rev_id',
                        'rev_page',
@@ -281,9 +328,9 @@ class Revision {
                        'rev_parent_id'
                );
        }
-       
+
        /**
-        * Return the list of text fields that should be selected to read the 
+        * Return the list of text fields that should be selected to read the
         * revision text
         */
        static function selectTextFields() {
@@ -305,10 +352,12 @@ class Revision {
        }
 
        /**
-        * @param object $row
+        * Constructor
+        *
+        * @param $row Mixed: either a database row or an array
         * @access private
         */
-       function Revision( $row ) {
+       function __construct( $row ) {
                if( is_object( $row ) ) {
                        $this->mId        = intval( $row->rev_id );
                        $this->mPage      = intval( $row->rev_page );
@@ -320,20 +369,21 @@ class Revision {
                        $this->mTimestamp =         $row->rev_timestamp;
                        $this->mDeleted   = intval( $row->rev_deleted );
 
-                       if( !isset( $row->rev_parent_id ) )
+                       if( !isset( $row->rev_parent_id ) ) {
                                $this->mParentId = is_null($row->rev_parent_id) ? null : 0;
-                       else
+                       } else {
                                $this->mParentId  = intval( $row->rev_parent_id );
+                       }
 
-                       if( !isset( $row->rev_len ) || is_null( $row->rev_len ) )
+                       if( !isset( $row->rev_len ) || is_null( $row->rev_len ) ) {
                                $this->mSize = null;
-                       else
+                       } else {
                                $this->mSize = intval( $row->rev_len );
+                       }
 
                        if( isset( $row->page_latest ) ) {
                                $this->mCurrent = ( $row->rev_id == $row->page_latest );
-                               $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
-                               $this->mTitle->resetArticleID( $this->mPage );
+                               $this->mTitle = Title::newFromRow( $row );
                        } else {
                                $this->mCurrent = false;
                                $this->mTitle = null;
@@ -376,15 +426,13 @@ class Revision {
                        throw new MWException( 'Revision constructor passed invalid row format.' );
                }
                $this->mUnpatrolled = null;
+               $this->mWikiID = false;
        }
 
-       /**#@+
-        * @access public
-        */
-
        /**
         * Get revision ID
-        * @return int
+        *
+        * @return Integer
         */
        public function getId() {
                return $this->mId;
@@ -392,7 +440,8 @@ class Revision {
 
        /**
         * Get text row ID
-        * @return int
+        *
+        * @return Integer
         */
        public function getTextId() {
                return $this->mTextId;
@@ -400,7 +449,8 @@ class Revision {
 
        /**
         * Get parent revision ID (the original previous page revision)
-        * @return int
+        *
+        * @return Integer
         */
        public function getParentId() {
                return $this->mParentId;
@@ -408,7 +458,8 @@ class Revision {
 
        /**
         * Returns the length of the text in this revision, or null if unknown.
-        * @return int
+        *
+        * @return Integer
         */
        public function getSize() {
                return $this->mSize;
@@ -416,29 +467,31 @@ class Revision {
 
        /**
         * Returns the title of the page associated with this entry.
+        *
         * @return Title
         */
        public function getTitle() {
                if( isset( $this->mTitle ) ) {
                        return $this->mTitle;
                }
-               $dbr = wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE, array(), $this->mWikiID );
+
                $row = $dbr->selectRow(
                        array( 'page', 'revision' ),
                        array( 'page_namespace', 'page_title' ),
                        array( 'page_id=rev_page',
-                              'rev_id' => $this->mId ),
+                                  'rev_id' => $this->mId ),
                        'Revision::getTitle' );
                if( $row ) {
-                       $this->mTitle = Title::makeTitle( $row->page_namespace,
-                                                         $row->page_title );
+                       $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
                }
                return $this->mTitle;
        }
 
        /**
         * Set the title of the revision
-        * @param Title $title
+        *
+        * @param $title Title
         */
        public function setTitle( $title ) {
                $this->mTitle = $title;
@@ -446,7 +499,8 @@ class Revision {
 
        /**
         * Get the page ID
-        * @return int
+        *
+        * @return Integer
         */
        public function getPage() {
                return $this->mPage;
@@ -454,16 +508,16 @@ class Revision {
 
        /**
         * Fetch revision's user id if it's available to the specified audience.
-        * If the specified audience does not have access to it, zero will be 
+        * If the specified audience does not have access to it, zero will be
         * returned.
         *
-        * @param integer $audience One of:
+        * @param $audience Integer: one of:
         *      Revision::FOR_PUBLIC       to be displayed to all users
         *      Revision::FOR_THIS_USER    to be displayed to $wgUser
         *      Revision::RAW              get the ID regardless of permissions
         *
         *
-        * @return int
+        * @return Integer
         */
        public function getUser( $audience = self::FOR_PUBLIC ) {
                if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_USER ) ) {
@@ -477,7 +531,8 @@ class Revision {
 
        /**
         * Fetch revision's user id without regard for the current user's permissions
-        * @return string
+        *
+        * @return String
         */
        public function getRawUser() {
                return $this->mUser;
@@ -485,10 +540,10 @@ class Revision {
 
        /**
         * Fetch revision's username if it's available to the specified audience.
-        * If the specified audience does not have access to the username, an 
+        * If the specified audience does not have access to the username, an
         * empty string will be returned.
         *
-        * @param integer $audience One of:
+        * @param $audience Integer: one of:
         *      Revision::FOR_PUBLIC       to be displayed to all users
         *      Revision::FOR_THIS_USER    to be displayed to $wgUser
         *      Revision::RAW              get the text regardless of permissions
@@ -507,7 +562,8 @@ class Revision {
 
        /**
         * Fetch revision's username without regard for view restrictions
-        * @return string
+        *
+        * @return String
         */
        public function getRawUserText() {
                return $this->mUserText;
@@ -515,15 +571,15 @@ class Revision {
 
        /**
         * Fetch revision comment if it's available to the specified audience.
-        * If the specified audience does not have access to the comment, an 
+        * If the specified audience does not have access to the comment, an
         * empty string will be returned.
         *
-        * @param integer $audience One of:
+        * @param $audience Integer: one of:
         *      Revision::FOR_PUBLIC       to be displayed to all users
         *      Revision::FOR_THIS_USER    to be displayed to $wgUser
         *      Revision::RAW              get the text regardless of permissions
         *
-        * @return string
+        * @return String
         */
        function getComment( $audience = self::FOR_PUBLIC ) {
                if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_COMMENT ) ) {
@@ -537,27 +593,28 @@ class Revision {
 
        /**
         * Fetch revision comment without regard for the current user's permissions
-        * @return string
+        *
+        * @return String
         */
        public function getRawComment() {
                return $this->mComment;
        }
 
        /**
-        * @return bool
+        * @return Boolean
         */
        public function isMinor() {
                return (bool)$this->mMinorEdit;
        }
-       
+
        /**
-        * @return int rcid of the unpatrolled row, zero if there isn't one
+        * @return Integer rcid of the unpatrolled row, zero if there isn't one
         */
        public function isUnpatrolled() {
                if( $this->mUnpatrolled !== null ) {
                        return $this->mUnpatrolled;
                }
-               $dbr = wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE, array(), $this->mWikiID );
                $this->mUnpatrolled = $dbr->selectField( 'recentchanges',
                        'rc_id',
                        array( // Add redundant user,timestamp condition so we can use the existing index
@@ -572,8 +629,9 @@ class Revision {
        }
 
        /**
-        * int $field one of DELETED_* bitfield constants
-        * @return bool
+        * @param $field int one of DELETED_* bitfield constants
+        *
+        * @return Boolean
         */
        public function isDeleted( $field ) {
                return ( $this->mDeleted & $field ) == $field;
@@ -581,23 +639,24 @@ class Revision {
 
        /**
         * Get the deletion bitfield of the revision
-        */     
+        *
+        * @return int
+        */
        public function getVisibility() {
                return (int)$this->mDeleted;
        }
 
        /**
         * Fetch revision text if it's available to the specified audience.
-        * If the specified audience does not have the ability to view this 
+        * If the specified audience does not have the ability to view this
         * revision, an empty string will be returned.
         *
-        * @param integer $audience One of:
+        * @param $audience Integer: one of:
         *      Revision::FOR_PUBLIC       to be displayed to all users
         *      Revision::FOR_THIS_USER    to be displayed to $wgUser
         *      Revision::RAW              get the text regardless of permissions
         *
-        *
-        * @return string
+        * @return String
         */
        public function getText( $audience = self::FOR_PUBLIC ) {
                if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_TEXT ) ) {
@@ -611,14 +670,19 @@ class Revision {
 
        /**
         * Alias for getText(Revision::FOR_THIS_USER)
+        *
+        * @deprecated since 1.17
+        * @return String
         */
        public function revText() {
+               wfDeprecated( __METHOD__ );
                return $this->getText( self::FOR_THIS_USER );
        }
 
        /**
         * Fetch revision text without regard for view restrictions
-        * @return string
+        *
+        * @return String
         */
        public function getRawText() {
                if( is_null( $this->mText ) ) {
@@ -629,14 +693,14 @@ class Revision {
        }
 
        /**
-        * @return string
+        * @return String
         */
        public function getTimestamp() {
-               return wfTimestamp(TS_MW, $this->mTimestamp);
+               return wfTimestamp( TS_MW, $this->mTimestamp );
        }
 
        /**
-        * @return bool
+        * @return Boolean
         */
        public function isCurrent() {
                return $this->mCurrent;
@@ -644,7 +708,8 @@ class Revision {
 
        /**
         * Get previous revision for this title
-        * @return Revision
+        *
+        * @return Revision or null
         */
        public function getPrevious() {
                if( $this->getTitle() ) {
@@ -657,7 +722,9 @@ class Revision {
        }
 
        /**
-        * @return Revision
+        * Get next revision for this title
+        *
+        * @return Revision or null
         */
        public function getNext() {
                if( $this->getTitle() ) {
@@ -672,8 +739,9 @@ class Revision {
        /**
         * Get previous revision Id for this page_id
         * This is used to populate rev_parent_id on save
-        * @param Database $db
-        * @return int
+        *
+        * @param $db DatabaseBase
+        * @return Integer
         */
        private function getPreviousRevisionId( $db ) {
                if( is_null( $this->mPage ) ) {
@@ -698,9 +766,9 @@ class Revision {
          * $row is usually an object from wfFetchRow(), both the flags and the text
          * field must be included
          *
-         * @param object $row The text data
-         * @param string $prefix table prefix (default 'old_')
-         * @return string $text|false the text requested
+         * @param $row Object: the text data
+         * @param $prefix String: table prefix (default 'old_')
+         * @return String: text the text requested or false on failure
          */
        public static function getRevisionText( $row, $prefix = 'old_' ) {
                wfProfileIn( __METHOD__ );
@@ -725,8 +793,8 @@ class Revision {
                # Use external methods for external objects, text in table is URL-only then
                if ( in_array( 'external', $flags ) ) {
                        $url = $text;
-                       @list(/* $proto */, $path ) = explode( '://', $url, 2 );
-                       if( $path == '' ) {
+                       $parts = explode( '://', $url, 2 );
+                       if( count( $parts ) == 1 || $parts[1] == '' ) {
                                wfProfileOut( __METHOD__ );
                                return false;
                        }
@@ -754,13 +822,15 @@ class Revision {
                        }
 
                        global $wgLegacyEncoding;
-                       if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) ) {
+                       if( $text !== false && $wgLegacyEncoding
+                               && !in_array( 'utf-8', $flags ) && !in_array( 'utf8', $flags ) )
+                       {
                                # Old revisions kept around in a legacy encoding?
                                # Upconvert on demand.
                                # ("utf8" checked for compatibility with some broken
                                #  conversion scripts 2008-12-30)
-                               global $wgInputEncoding, $wgContLang;
-                               $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
+                               global $wgContLang;
+                               $text = $wgContLang->iconv( $wgLegacyEncoding, 'UTF-8', $text );
                        }
                }
                wfProfileOut( __METHOD__ );
@@ -774,8 +844,8 @@ class Revision {
         * data is compressed, and 'utf-8' if we're saving in UTF-8
         * mode.
         *
-        * @param mixed $text reference to a text
-        * @return string
+        * @param $text Mixed: reference to a text
+        * @return String
         */
        public static function compressRevisionText( &$text ) {
                global $wgCompressRevisions;
@@ -800,8 +870,8 @@ class Revision {
         * Insert a new revision into the database, returning the new revision ID
         * number on success and dies horribly on failure.
         *
-        * @param Database $dbw
-        * @return int
+        * @param $dbw DatabaseBase: (master connection)
+        * @return Integer
         */
        public function insertOn( $dbw ) {
                global $wgDefaultExternalStore;
@@ -837,6 +907,8 @@ class Revision {
                        $this->mTextId = $dbw->insertId();
                }
 
+               if ( $this->mComment === null ) $this->mComment = "";
+
                # Record the edit in revisions
                $rev_id = isset( $this->mId )
                        ? $this->mId
@@ -852,7 +924,7 @@ class Revision {
                                'rev_user_text'  => $this->mUserText,
                                'rev_timestamp'  => $dbw->timestamp( $this->mTimestamp ),
                                'rev_deleted'    => $this->mDeleted,
-                               'rev_len'            => $this->mSize,
+                               'rev_len'        => $this->mSize,
                                'rev_parent_id'  => is_null($this->mParentId) ?
                                        $this->getPreviousRevisionId( $dbw ) : $this->mParentId
                        ), __METHOD__
@@ -870,7 +942,7 @@ class Revision {
         * Lazy-load the revision's text.
         * Currently hardcoded to the 'text' table storage engine.
         *
-        * @return string
+        * @return String
         */
        protected function loadText() {
                wfProfileIn( __METHOD__ );
@@ -878,7 +950,11 @@ class Revision {
                // Caching may be beneficial for massive use of external storage
                global $wgRevisionCacheExpiry, $wgMemc;
                $textId = $this->getTextId();
+               if( isset( $this->mWikiID ) && $this->mWikiID !== false ) {
+                       $key = wfForeignMemcKey( $this->mWikiID, null, 'revisiontext', 'textid', $textId );
+               } else {
                $key = wfMemcKey( 'revisiontext', 'textid', $textId );
+               }
                if( $wgRevisionCacheExpiry ) {
                        $text = $wgMemc->get( $key );
                        if( is_string( $text ) ) {
@@ -898,7 +974,7 @@ class Revision {
 
                if( !$row ) {
                        // Text data is immutable; check slaves first.
-                       $dbr = wfGetDB( DB_SLAVE );
+                       $dbr = wfGetDB( DB_SLAVE, array(), $this->mWikiID );
                        $row = $dbr->selectRow( 'text',
                                array( 'old_text', 'old_flags' ),
                                array( 'old_id' => $this->getTextId() ),
@@ -907,7 +983,7 @@ class Revision {
 
                if( !$row && wfGetLB()->getServerCount() > 1 ) {
                        // Possible slave lag!
-                       $dbw = wfGetDB( DB_MASTER );
+                       $dbw = wfGetDB( DB_MASTER, array(), $this->mWikiID );
                        $row = $dbw->selectRow( 'text',
                                array( 'old_text', 'old_flags' ),
                                array( 'old_id' => $this->getTextId() ),
@@ -934,11 +1010,11 @@ class Revision {
         * Such revisions can for instance identify page rename
         * operations and other such meta-modifications.
         *
-        * @param Database $dbw
-        * @param int      $pageId ID number of the page to read from
-        * @param string   $summary
-        * @param bool     $minor
-        * @return mixed Revision, or null on error
+        * @param $dbw DatabaseBase
+        * @param $pageId Integer: ID number of the page to read from
+        * @param $summary String: revision's summary
+        * @param $minor Boolean: whether the revision should be considered as minor
+        * @return Revision|null on error
         */
        public static function newNullRevision( $dbw, $pageId, $summary, $minor ) {
                wfProfileIn( __METHOD__ );
@@ -972,10 +1048,11 @@ class Revision {
        /**
         * Determine if the current user is allowed to view a particular
         * field of this revision, if it's marked as deleted.
-        * @param int $field one of self::DELETED_TEXT,
-        *                          self::DELETED_COMMENT,
-        *                          self::DELETED_USER
-        * @return bool
+        *
+        * @param $field Integer:one of self::DELETED_TEXT,
+        *                              self::DELETED_COMMENT,
+        *                              self::DELETED_USER
+        * @return Boolean
         */
        public function userCan( $field ) {
                return self::userCanBitfield( $this->mDeleted, $field );
@@ -985,16 +1062,16 @@ class Revision {
         * Determine if the current user is allowed to view a particular
         * field of this revision, if it's marked as deleted. This is used
         * by various classes to avoid duplication.
-        * @param int $bitfield (current field)
-        * @param int $field one of self::DELETED_TEXT = File::DELETED_FILE,
-        *                          self::DELETED_COMMENT = File::DELETED_COMMENT,
-        *                          self::DELETED_USER = File::DELETED_USER
-        * @return bool
+        *
+        * @param $bitfield Integer: current field
+        * @param $field Integer: one of self::DELETED_TEXT = File::DELETED_FILE,
+        *                               self::DELETED_COMMENT = File::DELETED_COMMENT,
+        *                               self::DELETED_USER = File::DELETED_USER
+        * @return Boolean
         */
        public static function userCanBitfield( $bitfield, $field ) {
                if( $bitfield & $field ) { // aspect is deleted
                        global $wgUser;
-                       $permission = '';
                        if ( $bitfield & self::DELETED_RESTRICTED ) {
                                $permission = 'suppressrevision';
                        } elseif ( $field & self::DELETED_TEXT ) {
@@ -1011,11 +1088,14 @@ class Revision {
 
        /**
         * Get rev_timestamp from rev_id, without loading the rest of the row
-        * @param Title $title
-        * @param integer $id
+        *
+        * @param $title Title
+        * @param $id Integer
+        * @return String
         */
        static function getTimestampFromId( $title, $id ) {
-               $dbr = wfGetDB( DB_SLAVE );
+               $wikiId = wfWikiID();
+               $dbr = wfGetDB( DB_SLAVE, array(), $wikiId );
                // Casting fix for DB2
                if ( $id == '' ) {
                        $id = 0;
@@ -1025,7 +1105,7 @@ class Revision {
                $timestamp = $dbr->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
                if ( $timestamp === false && wfGetLB()->getServerCount() > 1 ) {
                        # Not in slave, try master
-                       $dbw = wfGetDB( DB_MASTER );
+                       $dbw = wfGetDB( DB_MASTER, array(), $wikiId );
                        $timestamp = $dbw->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
                }
                return wfTimestamp( TS_MW, $timestamp );
@@ -1033,8 +1113,10 @@ class Revision {
 
        /**
         * Get count of revisions per page...not very efficient
-        * @param Database $db
-        * @param int $id, page id
+        *
+        * @param $db DatabaseBase
+        * @param $id Integer: page id
+        * @return Integer
         */
        static function countByPageId( $db, $id ) {
                $row = $db->selectRow( 'revision', 'COUNT(*) AS revCount',
@@ -1047,8 +1129,10 @@ class Revision {
 
        /**
         * Get count of revisions per page...not very efficient
-        * @param Database $db
-        * @param Title $title
+        *
+        * @param $db DatabaseBase
+        * @param $title Title
+        * @return Integer
         */
        static function countByTitle( $db, $title ) {
                $id = $title->getArticleId();
@@ -1058,11 +1142,3 @@ class Revision {
                return 0;
        }
 }
-
-/**
- * Aliases for backwards compatibility with 1.6
- */
-define( 'MW_REV_DELETED_TEXT', Revision::DELETED_TEXT );
-define( 'MW_REV_DELETED_COMMENT', Revision::DELETED_COMMENT );
-define( 'MW_REV_DELETED_USER', Revision::DELETED_USER );
-define( 'MW_REV_DELETED_RESTRICTED', Revision::DELETED_RESTRICTED );