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
Merge "Normalize input to TitleParser::parseTitle()"
[lhc/web/wiklou.git]
/
includes
/
specials
/
pagers
/
MergeHistoryPager.php
diff --git
a/includes/specials/pagers/MergeHistoryPager.php
b/includes/specials/pagers/MergeHistoryPager.php
index
bbf97e1
..
9415cea
100644
(file)
--- a/
includes/specials/pagers/MergeHistoryPager.php
+++ b/
includes/specials/pagers/MergeHistoryPager.php
@@
-30,7
+30,7
@@
class MergeHistoryPager extends ReverseChronologicalPager {
/** @var array */
public $mConds;
/** @var array */
public $mConds;
- function __construct( SpecialMergeHistory $form, $conds, Title $source, Title $dest ) {
+
public
function __construct( SpecialMergeHistory $form, $conds, Title $source, Title $dest ) {
$this->mForm = $form;
$this->mConds = $conds;
$this->title = $source;
$this->mForm = $form;
$this->mConds = $conds;
$this->title = $source;
@@
-48,7
+48,7
@@
class MergeHistoryPager extends ReverseChronologicalPager {
parent::__construct( $form->getContext() );
}
parent::__construct( $form->getContext() );
}
- function getStartBody() {
+
protected
function getStartBody() {
# Do a link batch query
$this->mResult->seek( 0 );
$batch = new LinkBatch();
# Do a link batch query
$this->mResult->seek( 0 );
$batch = new LinkBatch();
@@
-85,13
+85,12
@@
class MergeHistoryPager extends ReverseChronologicalPager {
$conds['rev_page'] = $this->articleID;
$conds[] = "rev_timestamp < " . $this->mDb->addQuotes( $this->maxTimestamp );
$conds['rev_page'] = $this->articleID;
$conds[] = "rev_timestamp < " . $this->mDb->addQuotes( $this->maxTimestamp );
+ $revQuery = Revision::getQueryInfo( [ 'page', 'user' ] );
return [
return [
- 'tables' =>
[ 'revision', 'page', 'user'
],
- 'fields' =>
array_merge( Revision::selectFields(), Revision::selectUserFields() )
,
+ 'tables' =>
$revQuery['tables'
],
+ 'fields' =>
$revQuery['fields']
,
'conds' => $conds,
'conds' => $conds,
- 'join_conds' => [
- 'page' => Revision::pageJoinCond(),
- 'user' => Revision::userJoinCond() ]
+ 'join_conds' => $revQuery['joins']
];
}
];
}