X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=blobdiff_plain;f=includes%2FRevision.php;h=b40cd71dab04753e4a3f307177155b1bd0422426;hb=bdbe861d3472ca62e39b9c1553e92661cbb9d4ff;hp=31814fe6c5f88d73d699208dd2d598785adee1f6;hpb=e18a7df8f4623c203ee7ca06b2f8ddb19269e7ae;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Revision.php b/includes/Revision.php index 31814fe6c5..b40cd71dab 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -4,6 +4,27 @@ * @todo document */ class Revision { + protected $mId; + protected $mPage; + protected $mUserText; + protected $mOrigUserText; + protected $mUser; + protected $mMinorEdit; + protected $mTimestamp; + protected $mDeleted; + protected $mSize; + protected $mSha1; + protected $mParentId; + protected $mComment; + protected $mText; + protected $mTextRow; + protected $mTitle; + protected $mCurrent; + protected $mContentModelName; + protected $mContentFormat; + protected $mContent; + protected $mContentHandler; + const DELETED_TEXT = 1; const DELETED_COMMENT = 2; const DELETED_USER = 4; @@ -23,9 +44,7 @@ class Revision { * @return Revision or null */ public static function newFromId( $id ) { - return Revision::newFromConds( - array( 'page_id=rev_page', - 'rev_id' => intval( $id ) ) ); + return Revision::newFromConds( array( 'rev_id' => intval( $id ) ) ); } /** @@ -34,13 +53,13 @@ class Revision { * to that title, will return null. * * @param $title Title - * @param $id Integer + * @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 @@ -50,26 +69,56 @@ 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 { // Use a join to get the latest revision $conds[] = 'rev_id=page_latest'; } - $conds[] = 'page_id=rev_page'; + 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'; + } 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) - * @todo 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, @@ -78,14 +127,31 @@ class Revision { 'minor_edit' => $row->ar_minor_edit, 'text_id' => isset( $row->ar_text_id ) ? $row->ar_text_id : null, 'deleted' => $row->ar_deleted, - 'len' => $row->ar_len); + 'len' => $row->ar_len, + 'sha1' => isset( $row->ar_sha1 ) ? $row->ar_sha1 : null, + 'content_model' => isset( $row->ar_content_model ) ? $row->ar_content_model : null, + 'content_format' => isset( $row->ar_content_format ) ? $row->ar_content_format : null, + ); 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. @@ -95,9 +161,7 @@ class Revision { * @return Revision or null */ public static function loadFromId( $db, $id ) { - return Revision::loadFromConds( $db, - array( 'page_id=rev_page', - 'rev_id' => intval( $id ) ) ); + return Revision::loadFromConds( $db, array( 'rev_id' => intval( $id ) ) ); } /** @@ -111,7 +175,7 @@ class Revision { * @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 ) ); + $conds = array( 'rev_page' => intval( $pageid ), 'page_id' => intval( $pageid ) ); if( $id ) { $conds['rev_id'] = intval( $id ); } else { @@ -136,12 +200,11 @@ class Revision { } else { $matchId = 'page_latest'; } - return Revision::loadFromConds( - $db, + return Revision::loadFromConds( $db, array( "rev_id=$matchId", - 'page_id=rev_page', - 'page_namespace' => $title->getNamespace(), - 'page_title' => $title->getDBkey() ) ); + 'page_namespace' => $title->getNamespace(), + 'page_title' => $title->getDBkey() ) + ); } /** @@ -149,18 +212,17 @@ class Revision { * WARNING: Timestamps may in some circumstances not be unique, * so this isn't the best key to use. * - * @param $db Database + * @param $db DatabaseBase * @param $title Title * @param $timestamp String * @return Revision or null */ public static function loadFromTimestamp( $db, $title, $timestamp ) { - return Revision::loadFromConds( - $db, + return Revision::loadFromConds( $db, array( 'rev_timestamp' => $db->timestamp( $timestamp ), - 'page_id=rev_page', - 'page_namespace' => $title->getNamespace(), - 'page_title' => $title->getDBkey() ) ); + 'page_namespace' => $title->getNamespace(), + 'page_title' => $title->getDBkey() ) + ); } /** @@ -171,19 +233,19 @@ class Revision { */ public static function newFromConds( $conditions ) { $db = wfGetDB( DB_SLAVE ); - $row = Revision::loadFromConds( $db, $conditions ); - if( is_null( $row ) && wfGetLB()->getServerCount() > 1 ) { + $rev = Revision::loadFromConds( $db, $conditions ); + if( is_null( $rev ) && wfGetLB()->getServerCount() > 1 ) { $dbw = wfGetDB( DB_MASTER ); - $row = Revision::loadFromConds( $dbw, $conditions ); + $rev = Revision::loadFromConds( $dbw, $conditions ); } - return $row; + return $rev; } /** * Given a set of conditions, fetch a revision from * the given database connection. * - * @param $db Database + * @param $db DatabaseBase * @param $conditions Array * @return Revision or null */ @@ -191,7 +253,6 @@ class Revision { $res = Revision::fetchFromConds( $db, $conditions ); if( $res ) { $row = $res->fetchObject(); - $res->free(); if( $row ) { $ret = new Revision( $row ); return $ret; @@ -213,9 +274,9 @@ class Revision { 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() ) + ); } /** @@ -223,50 +284,74 @@ class Revision { * which will return matching database rows with the * fields necessary to build Revision objects. * - * @param $db Database + * @param $db DatabaseBase * @param $conditions Array * @return ResultWrapper */ private static function fetchFromConds( $db, $conditions ) { - $fields = self::selectFields(); - $fields[] = 'page_namespace'; - $fields[] = 'page_title'; - $fields[] = 'page_latest'; - $res = $db->select( - array( 'page', 'revision' ), + $fields = array_merge( + self::selectFields(), + self::selectPageFields(), + self::selectUserFields() + ); + return $db->select( + array( 'revision', 'page', 'user' ), $fields, $conditions, __METHOD__, - array( 'LIMIT' => 1 ) ); - $ret = $db->resultObject( $res ); - return $ret; + array( 'LIMIT' => 1 ), + array( 'page' => self::pageJoinCond(), 'user' => self::userJoinCond() ) + ); + } + + /** + * Return the value of a select() JOIN conds array for the user table. + * This will get user table rows for logged-in users. + * @since 1.19 + * @return Array + */ + public static function userJoinCond() { + return array( 'LEFT JOIN', array( 'rev_user != 0', 'user_id = rev_user' ) ); + } + + /** + * Return the value of a select() page conds array for the paeg table. + * This will assure that the revision(s) are not orphaned from live pages. + * @since 1.19 + * @return Array + */ + public static function pageJoinCond() { + return array( 'INNER JOIN', array( 'page_id = rev_page' ) ); } /** * 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', 'rev_text_id', 'rev_timestamp', 'rev_comment', - 'rev_user_text,'. + 'rev_user_text', 'rev_user', 'rev_minor_edit', 'rev_deleted', 'rev_len', - 'rev_parent_id' + 'rev_parent_id', + 'rev_sha1', + 'rev_content_format', + 'rev_content_model' ); } - + /** - * 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() { + public static function selectTextFields() { return array( 'old_text', 'old_flags' @@ -276,51 +361,77 @@ class Revision { /** * Return the list of page fields that should be selected from page table */ - static function selectPageFields() { + public static function selectPageFields() { return array( 'page_namespace', 'page_title', + 'page_id', 'page_latest' ); } + /** + * Return the list of user fields that should be selected from user table + */ + public static function selectUserFields() { + return array( 'user_name' ); + } + /** * 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 ); $this->mTextId = intval( $row->rev_text_id ); $this->mComment = $row->rev_comment; - $this->mUserText = $row->rev_user_text; $this->mUser = intval( $row->rev_user ); $this->mMinorEdit = intval( $row->rev_minor_edit ); $this->mTimestamp = $row->rev_timestamp; $this->mDeleted = intval( $row->rev_deleted ); - if( !isset( $row->rev_parent_id ) ) - $this->mParentId = is_null($row->rev_parent_id) ? null : 0; - else + if( !isset( $row->rev_parent_id ) ) { + $this->mParentId = is_null( $row->rev_parent_id ) ? null : 0; + } 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->rev_sha1 ) ) { + $this->mSha1 = null; + } else { + $this->mSha1 = $row->rev_sha1; + } 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; } + if( !isset( $row->rev_content_model ) || is_null( $row->rev_content_model ) ) { + $this->mContentModelName = null; # determine on demand if needed + } else { + $this->mContentModelName = strval( $row->rev_content_model ); + } + + if( !isset( $row->rev_content_format ) || is_null( $row->rev_content_format ) ) { + $this->mContentFormat = null; # determine on demand if needed + } else { + $this->mContentFormat = strval( $row->rev_content_format ); + } + // Lazy extraction... $this->mText = null; if( isset( $row->old_text ) ) { @@ -329,9 +440,31 @@ class Revision { // 'text' table row entry will be lazy-loaded $this->mTextRow = null; } + + // Use user_name for users and rev_user_text for IPs... + $this->mUserText = null; // lazy load if left null + if ( $this->mUser == 0 ) { + $this->mUserText = $row->rev_user_text; // IP user + } elseif ( isset( $row->user_name ) ) { + $this->mUserText = $row->user_name; // logged-in user + } + $this->mOrigUserText = $row->rev_user_text; } elseif( is_array( $row ) ) { // Build a new revision to be saved... - global $wgUser; + global $wgUser; // ugh + + + # if we have a content object, use it to set the model and type + if ( !empty( $row['content'] ) ) { + if ( !empty( $row['text_id'] ) ) { #FIXME: when is that set? test with external store setup! check out insertOn() + throw new MWException( "Text already stored in external store (id {$row['text_id']}), can't serialize content object" ); + } + + $row['content_model'] = $row['content']->getModelName(); + # note: mContentFormat is initializes later accordingly + # note: content is serialized later in this method! + # also set text to null? + } $this->mId = isset( $row['id'] ) ? intval( $row['id'] ) : null; $this->mPage = isset( $row['page'] ) ? intval( $row['page'] ) : null; @@ -339,10 +472,20 @@ class Revision { $this->mUserText = isset( $row['user_text'] ) ? strval( $row['user_text'] ) : $wgUser->getName(); $this->mUser = isset( $row['user'] ) ? intval( $row['user'] ) : $wgUser->getId(); $this->mMinorEdit = isset( $row['minor_edit'] ) ? intval( $row['minor_edit'] ) : 0; - $this->mTimestamp = isset( $row['timestamp'] ) ? strval( $row['timestamp'] ) : wfTimestamp( TS_MW ); + $this->mTimestamp = isset( $row['timestamp'] ) ? strval( $row['timestamp'] ) : wfTimestampNow(); $this->mDeleted = isset( $row['deleted'] ) ? intval( $row['deleted'] ) : 0; $this->mSize = isset( $row['len'] ) ? intval( $row['len'] ) : null; $this->mParentId = isset( $row['parent_id'] ) ? intval( $row['parent_id'] ) : null; + $this->mSha1 = isset( $row['sha1'] ) ? strval( $row['sha1'] ) : null; + + $this->mContentModelName = isset( $row['content_model'] ) ? strval( $row['content_model'] ) : null; + $this->mContentFormat = isset( $row['content_format'] ) ? strval( $row['content_format'] ) : null; + + if( !isset( $row->rev_content_format ) || is_null( $row->rev_content_format ) ) { + $this->mContentFormat = null; # determine on demand if needed + } else { + $this->mContentFormat = $row->rev_content_format; + } // Enforce spacing trimming on supplied text $this->mComment = isset( $row['comment'] ) ? trim( strval( $row['comment'] ) ) : null; @@ -351,13 +494,30 @@ class Revision { $this->mTitle = null; # Load on demand if needed $this->mCurrent = false; - # If we still have no len_size, see it we have the text to figure it out - if ( !$this->mSize ) - $this->mSize = is_null( $this->mText ) ? null : strlen( $this->mText ); + # If we still have no length, see it we have the text to figure it out + if ( !$this->mSize ) { + $this->mSize = is_null( $this->mText ) ? null : strlen( $this->mText ); #FIXME: do strlen in Content object + } + # Same for sha1 + if ( $this->mSha1 === null ) { + $this->mSha1 = is_null( $this->mText ) ? null : self::base36Sha1( $this->mText ); + } + + $this->getContentModelName(); # force lazy init + $this->getContentFormat(); # force lazy init + + # if we have a content object, serialize it, overriding mText + if ( !empty( $row['content'] ) ) { + $handler = $this->getContentHandler(); + $this->mText = $handler->serialize( $row['content'], $this->getContentFormat() ); + } } else { throw new MWException( 'Revision constructor passed invalid row format.' ); } $this->mUnpatrolled = null; + + #FIXME: add patch for ar_content_format, ar_content_model, rev_content_format, rev_content_model to installer + #FIXME: add support for ar_content_format, ar_content_model, rev_content_format, rev_content_model to API } /** @@ -369,6 +529,16 @@ class Revision { return $this->mId; } + /** + * Set the revision ID + * + * @since 1.19 + * @param $id Integer + */ + public function setId( $id ) { + $this->mId = $id; + } + /** * Get text row ID * @@ -396,6 +566,15 @@ class Revision { return $this->mSize; } + /** + * Returns the base36 sha1 of the text in this revision, or null if unknown. + * + * @return String + */ + public function getSha1() { + return $this->mSha1; + } + /** * Returns the title of the page associated with this entry. * @@ -410,11 +589,10 @@ class Revision { 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; } @@ -439,21 +617,21 @@ 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 $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 - * - * + * @param $user User object to check for, only if FOR_THIS_USER is passed + * to the $audience parameter * @return Integer */ - public function getUser( $audience = self::FOR_PUBLIC ) { + public function getUser( $audience = self::FOR_PUBLIC, User $user = null ) { if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_USER ) ) { return 0; - } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_USER ) ) { + } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_USER, $user ) ) { return 0; } else { return $this->mUser; @@ -471,23 +649,24 @@ 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 $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 - * + * @param $user User object to check for, only if FOR_THIS_USER is passed + * to the $audience parameter * @return string */ - public function getUserText( $audience = self::FOR_PUBLIC ) { + public function getUserText( $audience = self::FOR_PUBLIC, User $user = null ) { if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_USER ) ) { return ''; - } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_USER ) ) { + } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_USER, $user ) ) { return ''; } else { - return $this->mUserText; + return $this->getRawUserText(); } } @@ -497,25 +676,34 @@ class Revision { * @return String */ public function getRawUserText() { + if ( $this->mUserText === null ) { + $this->mUserText = User::whoIs( $this->mUser ); // load on demand + if ( $this->mUserText === false ) { + # This shouldn't happen, but it can if the wiki was recovered + # via importing revs and there is no user table entry yet. + $this->mUserText = $this->mOrigUserText; + } + } return $this->mUserText; } /** * 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 $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 - * + * @param $user User object to check for, only if FOR_THIS_USER is passed + * to the $audience parameter * @return String */ - function getComment( $audience = self::FOR_PUBLIC ) { + function getComment( $audience = self::FOR_PUBLIC, User $user = null ) { if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_COMMENT ) ) { return ''; - } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_COMMENT ) ) { + } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_COMMENT, $user ) ) { return ''; } else { return $this->mComment; @@ -537,7 +725,7 @@ class Revision { public function isMinor() { return (bool)$this->mMinorEdit; } - + /** * @return Integer rcid of the unpatrolled row, zero if there isn't one */ @@ -560,7 +748,7 @@ class Revision { } /** - * int $field one of DELETED_* bitfield constants + * @param $field int one of DELETED_* bitfield constants * * @return Boolean */ @@ -570,6 +758,8 @@ class Revision { /** * Get the deletion bitfield of the revision + * + * @return int */ public function getVisibility() { return (int)$this->mDeleted; @@ -577,34 +767,56 @@ class Revision { /** * 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 $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 - * - * + * @param $user User object to check for, only if FOR_THIS_USER is passed + * to the $audience parameter * @return String + * @deprectaed in 1.20, use getContent() instead */ - public function getText( $audience = self::FOR_PUBLIC ) { - if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_TEXT ) ) { - return ''; - } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_TEXT ) ) { - return ''; - } else { - return $this->getRawText(); - } + public function getText( $audience = self::FOR_PUBLIC, User $user = null ) { #FIXME: deprecated, replace usage! #FIXME: used a LOT! + wfDeprecated( __METHOD__, '1.20' ); + + $content = $this->getContent(); + return ContentHandler::getContentText( $content ); # returns the raw content text, if applicable } + /** + * Fetch revision content if it's available to the specified audience. + * If the specified audience does not have the ability to view this + * revision, null will be returned. + * + * @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 + * @param $user User object to check for, only if FOR_THIS_USER is passed + * to the $audience parameter + * @return Content + */ + public function getContent( $audience = self::FOR_PUBLIC, User $user = null ) { + if( $audience == self::FOR_PUBLIC && $this->isDeleted( self::DELETED_TEXT ) ) { + return null; + } elseif( $audience == self::FOR_THIS_USER && !$this->userCan( self::DELETED_TEXT, $user ) ) { + return null; + } else { + return $this->getContentInternal(); + } + } + /** * Alias for getText(Revision::FOR_THIS_USER) * - * @deprecated + * @deprecated since 1.17 * @return String */ public function revText() { + wfDeprecated( __METHOD__, '1.17' ); return $this->getText( self::FOR_THIS_USER ); } @@ -613,14 +825,58 @@ class Revision { * * @return String */ - public function getRawText() { - if( is_null( $this->mText ) ) { - // Revision text is immutable. Load on demand: - $this->mText = $this->loadText(); - } - return $this->mText; + public function getRawText() { #FIXME: deprecated, replace usage! + return $this->getText( self::RAW ); } + protected function getContentInternal() { + if( is_null( $this->mContent ) ) { + // Revision is immutable. Load on demand: + + $handler = $this->getContentHandler(); + $format = $this->getContentFormat(); + + if( is_null( $this->mText ) ) { + // Load text on demand: + $this->mText = $this->loadText(); + } + + $this->mContent = $handler->unserialize( $this->mText, $format ); + } + + return $this->mContent; + } + + public function getContentModelName() { + if ( !$this->mContentModelName ) { + $title = $this->getTitle(); #XXX: never null? + $this->mContentModelName = $title->getContentModelName(); + } + + return $this->mContentModelName; + } + + public function getContentFormat() { + if ( !$this->mContentFormat ) { + $handler = $this->getContentHandler(); + $this->mContentFormat = $handler->getDefaultFormat(); + } + + return $this->mContentFormat; + } + + public function getContentHandler() { + if ( !$this->mContentHandler ) { + $m = $this->getModelName(); + $this->mContentHandler = ContentHandler::getForModelName( $m ); + + #XXX: do we need to verify that mContentHandler supports mContentFormat? + # otherwise, a fixed content format may cause problems on insert. + } + + return $this->mContentHandler; + } + /** * @return String */ @@ -722,8 +978,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; } @@ -751,15 +1007,15 @@ class Revision { } global $wgLegacyEncoding; - if( $text !== false && $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__ ); @@ -799,7 +1055,7 @@ class Revision { * Insert a new revision into the database, returning the new revision ID * number on success and dies horribly on failure. * - * @param $dbw DatabaseBase (master connection) + * @param $dbw DatabaseBase: (master connection) * @return Integer */ public function insertOn( $dbw ) { @@ -854,8 +1110,14 @@ class Revision { 'rev_timestamp' => $dbw->timestamp( $this->mTimestamp ), 'rev_deleted' => $this->mDeleted, 'rev_len' => $this->mSize, - 'rev_parent_id' => is_null($this->mParentId) ? - $this->getPreviousRevisionId( $dbw ) : $this->mParentId + 'rev_parent_id' => is_null( $this->mParentId ) + ? $this->getPreviousRevisionId( $dbw ) + : $this->mParentId, + 'rev_sha1' => is_null( $this->mSha1 ) + ? Revision::base36Sha1( $this->mText ) + : $this->mSha1, + 'rev_content_model' => $this->getContentModelName(), + 'rev_content_format' => $this->getContentFormat(), ), __METHOD__ ); @@ -867,6 +1129,15 @@ class Revision { return $this->mId; } + /** + * Get the base 36 SHA-1 value for a string of text + * @param $text String + * @return String + */ + public static function base36Sha1( $text ) { + return wfBaseConvert( sha1( $text ), 16, 36, 31 ); + } + /** * Lazy-load the revision's text. * Currently hardcoded to the 'text' table storage engine. @@ -939,14 +1210,15 @@ class Revision { * @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 Mixed: Revision, or null on error + * @return Revision|null on error */ public static function newNullRevision( $dbw, $pageId, $summary, $minor ) { wfProfileIn( __METHOD__ ); $current = $dbw->selectRow( array( 'page', 'revision' ), - array( 'page_latest', 'rev_text_id', 'rev_len' ), + array( 'page_latest', 'rev_text_id', 'rev_len', 'rev_sha1', + 'rev_content_model', 'rev_content_format' ), array( 'page_id' => $pageId, 'page_latest=rev_id', @@ -960,7 +1232,10 @@ class Revision { 'minor_edit' => $minor, 'text_id' => $current->rev_text_id, 'parent_id' => $current->page_latest, - 'len' => $current->rev_len + 'len' => $current->rev_len, + 'sha1' => $current->rev_sha1, + 'content_model' => $current->rev_content_model, + 'content_format' => $current->rev_content_format ) ); } else { $revision = null; @@ -977,10 +1252,11 @@ class Revision { * @param $field Integer:one of self::DELETED_TEXT, * self::DELETED_COMMENT, * self::DELETED_USER + * @param $user User object to check, or null to use $wgUser * @return Boolean */ - public function userCan( $field ) { - return self::userCanBitfield( $this->mDeleted, $field ); + public function userCan( $field, User $user = null ) { + return self::userCanBitfield( $this->mDeleted, $field, $user ); } /** @@ -992,12 +1268,11 @@ class Revision { * @param $field Integer: one of self::DELETED_TEXT = File::DELETED_FILE, * self::DELETED_COMMENT = File::DELETED_COMMENT, * self::DELETED_USER = File::DELETED_USER + * @param $user User object to check, or null to use $wgUser * @return Boolean */ - public static function userCanBitfield( $bitfield, $field ) { + public static function userCanBitfield( $bitfield, $field, User $user = null ) { if( $bitfield & $field ) { // aspect is deleted - global $wgUser; - $permission = ''; if ( $bitfield & self::DELETED_RESTRICTED ) { $permission = 'suppressrevision'; } elseif ( $field & self::DELETED_TEXT ) { @@ -1006,7 +1281,11 @@ class Revision { $permission = 'deletedhistory'; } wfDebug( "Checking for $permission due to $field match on $bitfield\n" ); - return $wgUser->isAllowed( $permission ); + if ( $user === null ) { + global $wgUser; + $user = $wgUser; + } + return $user->isAllowed( $permission ); } else { return true; } @@ -1067,11 +1346,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 );