dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use WatchedItemStore clearing in SpecialEditWatchlist
[lhc/web/wiklou.git]
/
includes
/
RevisionList.php
diff --git
a/includes/RevisionList.php
b/includes/RevisionList.php
index
d909a65
..
fa454e0
100644
(file)
--- a/
includes/RevisionList.php
+++ b/
includes/RevisionList.php
@@
-22,6
+22,7
@@
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\ResultWrapper;
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IDatabase;
/**
* List for revision table items for a single page
/**
* List for revision table items for a single page
@@
-36,7
+37,7
@@
abstract class RevisionListBase extends ContextSource implements Iterator {
/** @var ResultWrapper|bool */
protected $res;
/** @var ResultWrapper|bool */
protected $res;
- /** @var bool|
object
*/
+ /** @var bool|
Revision
*/
protected $current;
/**
protected $current;
/**
@@
-115,7
+116,7
@@
abstract class RevisionListBase extends ContextSource implements Iterator {
}
public function key() {
}
public function key() {
- return $this->res ? $this->res->key(): 0;
+ return $this->res ? $this->res->key()
: 0;
}
public function valid() {
}
public function valid() {
@@
-295,15
+296,14
@@
class RevisionList extends RevisionListBase {
if ( $this->ids !== null ) {
$conds['rev_id'] = array_map( 'intval', $this->ids );
}
if ( $this->ids !== null ) {
$conds['rev_id'] = array_map( 'intval', $this->ids );
}
+ $revQuery = Revision::getQueryInfo( [ 'page', 'user' ] );
return $db->select(
return $db->select(
-
[ 'revision', 'page', 'user'
],
-
array_merge( Revision::selectFields(), Revision::selectUserFields() )
,
+
$revQuery['tables'
],
+
$revQuery['fields']
,
$conds,
__METHOD__,
[ 'ORDER BY' => 'rev_id DESC' ],
$conds,
__METHOD__,
[ 'ORDER BY' => 'rev_id DESC' ],
- [
- 'page' => Revision::pageJoinCond(),
- 'user' => Revision::userJoinCond() ]
+ $revQuery['joins']
);
}
);
}