* @return Revision|null
*/
public static function newFromId( $id, $flags = 0 ) {
- return self::newFromConds( array( 'rev_id' => intval( $id ) ), $flags );
+ return self::newFromConds( [ 'rev_id' => intval( $id ) ], $flags );
}
/**
* @return Revision|null
*/
public static function newFromTitle( LinkTarget $linkTarget, $id = 0, $flags = 0 ) {
- $conds = array(
+ $conds = [
'page_namespace' => $linkTarget->getNamespace(),
'page_title' => $linkTarget->getDBkey()
- );
+ ];
if ( $id ) {
// Use the specified ID
$conds['rev_id'] = $id;
* @return Revision|null
*/
public static function newFromPageId( $pageId, $revId = 0, $flags = 0 ) {
- $conds = array( 'page_id' => $pageId );
+ $conds = [ 'page_id' => $pageId ];
if ( $revId ) {
$conds['rev_id'] = $revId;
return self::newFromConds( $conds, $flags );
* @throws MWException
* @return Revision
*/
- public static function newFromArchiveRow( $row, $overrides = array() ) {
+ public static function newFromArchiveRow( $row, $overrides = [] ) {
global $wgContentHandlerUseDB;
- $attribs = $overrides + array(
+ $attribs = $overrides + [
'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,
'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 ( !$wgContentHandlerUseDB ) {
unset( $attribs['content_model'] );
* @return Revision|null
*/
public static function loadFromId( $db, $id ) {
- return self::loadFromConds( $db, array( 'rev_id' => intval( $id ) ) );
+ return self::loadFromConds( $db, [ 'rev_id' => intval( $id ) ] );
}
/**
* @return Revision|null
*/
public static function loadFromPageId( $db, $pageid, $id = 0 ) {
- $conds = array( 'rev_page' => intval( $pageid ), 'page_id' => intval( $pageid ) );
+ $conds = [ 'rev_page' => intval( $pageid ), 'page_id' => intval( $pageid ) ];
if ( $id ) {
$conds['rev_id'] = intval( $id );
} else {
$matchId = 'page_latest';
}
return self::loadFromConds( $db,
- array(
+ [
"rev_id=$matchId",
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey()
- )
+ ]
);
}
*/
public static function loadFromTimestamp( $db, $title, $timestamp ) {
return self::loadFromConds( $db,
- array(
+ [
'rev_timestamp' => $db->timestamp( $timestamp ),
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey()
- )
+ ]
);
}
public static function fetchRevision( $title ) {
return self::fetchFromConds(
wfGetDB( DB_SLAVE ),
- array(
+ [
'rev_id=page_latest',
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey()
- )
+ ]
);
}
self::selectPageFields(),
self::selectUserFields()
);
- $options = array( 'LIMIT' => 1 );
+ $options = [ 'LIMIT' => 1 ];
if ( ( $flags & self::READ_LOCKING ) == self::READ_LOCKING ) {
$options[] = 'FOR UPDATE';
}
return $db->select(
- array( 'revision', 'page', 'user' ),
+ [ 'revision', 'page', 'user' ],
$fields,
$conditions,
__METHOD__,
$options,
- array( 'page' => self::pageJoinCond(), 'user' => self::userJoinCond() )
+ [ 'page' => self::pageJoinCond(), 'user' => self::userJoinCond() ]
);
}
* @return array
*/
public static function userJoinCond() {
- return array( 'LEFT JOIN', array( 'rev_user != 0', 'user_id = rev_user' ) );
+ return [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ];
}
/**
* @return array
*/
public static function pageJoinCond() {
- return array( 'INNER JOIN', array( 'page_id = rev_page' ) );
+ return [ 'INNER JOIN', [ 'page_id = rev_page' ] ];
}
/**
public static function selectFields() {
global $wgContentHandlerUseDB;
- $fields = array(
+ $fields = [
'rev_id',
'rev_page',
'rev_text_id',
'rev_len',
'rev_parent_id',
'rev_sha1',
- );
+ ];
if ( $wgContentHandlerUseDB ) {
$fields[] = 'rev_content_format';
*/
public static function selectArchiveFields() {
global $wgContentHandlerUseDB;
- $fields = array(
+ $fields = [
'ar_id',
'ar_page_id',
'ar_rev_id',
'ar_len',
'ar_parent_id',
'ar_sha1',
- );
+ ];
if ( $wgContentHandlerUseDB ) {
$fields[] = 'ar_content_format';
* @return array
*/
public static function selectTextFields() {
- return array(
+ return [
'old_text',
'old_flags'
- );
+ ];
}
/**
* @return array
*/
public static function selectPageFields() {
- return array(
+ return [
'page_namespace',
'page_title',
'page_id',
'page_latest',
'page_is_redirect',
'page_len',
- );
+ ];
}
/**
* @return array
*/
public static function selectUserFields() {
- return array( 'user_name' );
+ return [ 'user_name' ];
}
/**
* @return array
*/
public static function getParentLengths( $db, array $revIds ) {
- $revLens = array();
+ $revLens = [];
if ( !$revIds ) {
return $revLens; // empty
}
$res = $db->select( 'revision',
- array( 'rev_id', 'rev_len' ),
- array( 'rev_id' => $revIds ),
+ [ 'rev_id', 'rev_len' ],
+ [ 'rev_id' => $revIds ],
__METHOD__ );
foreach ( $res as $row ) {
$revLens[$row->rev_id] = $row->rev_len;
if ( $this->mId !== null ) {
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow(
- array( 'page', 'revision' ),
+ [ 'page', 'revision' ],
self::selectPageFields(),
- array( 'page_id=rev_page',
- 'rev_id' => $this->mId ),
+ [ 'page_id=rev_page',
+ 'rev_id' => $this->mId ],
__METHOD__ );
if ( $row ) {
$this->mTitle = Title::newFromRow( $row );
list( $dbType, ) = DBAccessObjectUtils::getDBOptions( $flags );
return RecentChange::newFromConds(
- array(
+ [
'rc_user_text' => $this->getUserText( Revision::RAW ),
'rc_timestamp' => $dbr->timestamp( $this->getTimestamp() ),
'rc_this_oldid' => $this->getId()
- ),
+ ],
__METHOD__,
$dbType
);
}
}
- /**
- * Fetch revision text without regard for view restrictions
- *
- * @return string
- *
- * @deprecated since 1.21. Instead, use Revision::getContent( Revision::RAW )
- * or Revision::getSerializedData() as appropriate.
- */
- public function getRawText() {
- ContentHandler::deprecated( __METHOD__, "1.21" );
- return $this->getText( self::RAW );
- }
-
/**
* Fetch original serialized data without regard for view restrictions
*
# Use page_latest if ID is not given
if ( !$this->mId ) {
$prevId = $db->selectField( 'page', 'page_latest',
- array( 'page_id' => $this->mPage ),
+ [ 'page_id' => $this->mPage ],
__METHOD__ );
} else {
$prevId = $db->selectField( 'revision', 'rev_id',
- array( 'rev_page' => $this->mPage, 'rev_id < ' . $this->mId ),
+ [ 'rev_page' => $this->mPage, 'rev_id < ' . $this->mId ],
__METHOD__,
- array( 'ORDER BY' => 'rev_id DESC' ) );
+ [ 'ORDER BY' => 'rev_id DESC' ] );
}
return intval( $prevId );
}
if ( isset( $row->$flagsField ) ) {
$flags = explode( ',', $row->$flagsField );
} else {
- $flags = array();
+ $flags = [];
}
if ( isset( $row->$textField ) ) {
if ( count( $parts ) == 1 || $parts[1] == '' ) {
return false;
}
- $text = ExternalStore::fetchFromURL( $url, array( 'wiki' => $wiki ) );
+ $text = ExternalStore::fetchFromURL( $url, [ 'wiki' => $wiki ] );
}
// If the text was fetched without an error, convert it
*/
public static function compressRevisionText( &$text ) {
global $wgCompressRevisions;
- $flags = array();
+ $flags = [];
# Revisions not marked this way will be converted
# on load if $wgLegacyCharset is set in the future.
if ( $this->mTextId === null ) {
$old_id = $dbw->nextSequenceValue( 'text_old_id_seq' );
$dbw->insert( 'text',
- array(
+ [
'old_id' => $old_id,
'old_text' => $data,
'old_flags' => $flags,
- ), __METHOD__
+ ], __METHOD__
);
$this->mTextId = $dbw->insertId();
}
$rev_id = $this->mId !== null
? $this->mId
: $dbw->nextSequenceValue( 'revision_rev_id_seq' );
- $row = array(
+ $row = [
'rev_id' => $rev_id,
'rev_page' => $this->mPage,
'rev_text_id' => $this->mTextId,
'rev_sha1' => $this->mSha1 === null
? Revision::base36Sha1( $this->mText )
: $this->mSha1,
- );
+ ];
if ( $wgContentHandlerUseDB ) {
// NOTE: Store null for the default model and format, to save space.
);
}
- Hooks::run( 'RevisionInsertComplete', array( &$this, $data, $flags ) );
+ Hooks::run( 'RevisionInsertComplete', [ &$this, $data, $flags ] );
return $this->mId;
}
protected function loadText() {
// Caching may be beneficial for massive use of external storage
global $wgRevisionCacheExpiry;
+ static $processCache = null;
+
+ if ( !$processCache ) {
+ $processCache = new MapCacheLRU( 10 );
+ }
$cache = ObjectCache::getMainWANInstance();
$textId = $this->getTextId();
$key = wfMemcKey( 'revisiontext', 'textid', $textId );
+
if ( $wgRevisionCacheExpiry ) {
+ if ( $processCache->has( $key ) ) {
+ return $processCache->get( $key );
+ }
$text = $cache->get( $key );
if ( is_string( $text ) ) {
wfDebug( __METHOD__ . ": got id $textId from cache\n" );
+ $processCache->set( $key, $text );
return $text;
}
}
// Text data is immutable; check slaves first.
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow( 'text',
- array( 'old_text', 'old_flags' ),
- array( 'old_id' => $textId ),
+ [ 'old_text', 'old_flags' ],
+ [ 'old_id' => $textId ],
__METHOD__ );
}
if ( !$row && ( $forUpdate || wfGetLB()->getServerCount() > 1 ) ) {
$dbw = wfGetDB( DB_MASTER );
$row = $dbw->selectRow( 'text',
- array( 'old_text', 'old_flags' ),
- array( 'old_id' => $textId ),
+ [ 'old_text', 'old_flags' ],
+ [ 'old_id' => $textId ],
__METHOD__,
- $forUpdate ? array( 'FOR UPDATE' ) : array() );
+ $forUpdate ? [ 'FOR UPDATE' ] : [] );
}
if ( !$row ) {
# No negative caching -- negative hits on text rows may be due to corrupted slave servers
if ( $wgRevisionCacheExpiry && $text !== false ) {
+ $processCache->set( $key, $text );
$cache->set( $key, $text, $wgRevisionCacheExpiry );
}
public static function newNullRevision( $dbw, $pageId, $summary, $minor, $user = null ) {
global $wgContentHandlerUseDB, $wgContLang;
- $fields = array( 'page_latest', 'page_namespace', 'page_title',
- 'rev_text_id', 'rev_len', 'rev_sha1' );
+ $fields = [ 'page_latest', 'page_namespace', 'page_title',
+ 'rev_text_id', 'rev_len', 'rev_sha1' ];
if ( $wgContentHandlerUseDB ) {
$fields[] = 'rev_content_model';
}
$current = $dbw->selectRow(
- array( 'page', 'revision' ),
+ [ 'page', 'revision' ],
$fields,
- array(
+ [
'page_id' => $pageId,
'page_latest=rev_id',
- ),
+ ],
__METHOD__,
- array( 'FOR UPDATE' ) // T51581
+ [ 'FOR UPDATE' ] // T51581
);
if ( $current ) {
// Truncate for whole multibyte characters
$summary = $wgContLang->truncate( $summary, 255 );
- $row = array(
+ $row = [
'page' => $pageId,
'user_text' => $user->getName(),
'user' => $user->getId(),
'parent_id' => $current->page_latest,
'len' => $current->rev_len,
'sha1' => $current->rev_sha1
- );
+ ];
if ( $wgContentHandlerUseDB ) {
$row['content_model'] = $current->rev_content_model;
$user = $wgUser;
}
if ( $bitfield & self::DELETED_RESTRICTED ) {
- $permissions = array( 'suppressrevision', 'viewsuppressed' );
+ $permissions = [ 'suppressrevision', 'viewsuppressed' ];
} elseif ( $field & self::DELETED_TEXT ) {
- $permissions = array( 'deletedtext' );
+ $permissions = [ 'deletedtext' ];
} else {
- $permissions = array( 'deletedhistory' );
+ $permissions = [ 'deletedhistory' ];
}
$permissionlist = implode( ', ', $permissions );
if ( $title === null ) {
wfDebug( "Checking for $permissionlist due to $field match on $bitfield\n" );
- return call_user_func_array( array( $user, 'isAllowedAny' ), $permissions );
+ return call_user_func_array( [ $user, 'isAllowedAny' ], $permissions );
} else {
$text = $title->getPrefixedText();
wfDebug( "Checking for $permissionlist on $text due to $field match on $bitfield\n" );
if ( $id == '' ) {
$id = 0;
}
- $conds = array( 'rev_id' => $id );
+ $conds = [ 'rev_id' => $id ];
$conds['rev_page'] = $title->getArticleID();
$timestamp = $db->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
* @return int
*/
static function countByPageId( $db, $id ) {
- $row = $db->selectRow( 'revision', array( 'revCount' => 'COUNT(*)' ),
- array( 'rev_page' => $id ), __METHOD__ );
+ $row = $db->selectRow( 'revision', [ 'revCount' => 'COUNT(*)' ],
+ [ 'rev_page' => $id ], __METHOD__ );
if ( $row ) {
return $row->revCount;
}
$res = $db->select( 'revision',
'rev_user',
- array(
+ [
'rev_page' => $pageId,
'rev_timestamp > ' . $db->addQuotes( $db->timestamp( $since ) )
- ),
+ ],
__METHOD__,
- array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 50 ) );
+ [ 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 50 ] );
foreach ( $res as $row ) {
if ( $row->rev_user != $userId ) {
return false;
dépôts / lhc / web / wiklou.git / blobdiff