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 "Rename CDN config variables to be generic, deprecating the old names"
[lhc/web/wiklou.git]
/
maintenance
/
rebuildrecentchanges.php
diff --git
a/maintenance/rebuildrecentchanges.php
b/maintenance/rebuildrecentchanges.php
index
471c7ae
..
4e92653
100644
(file)
--- a/
maintenance/rebuildrecentchanges.php
+++ b/
maintenance/rebuildrecentchanges.php
@@
-221,7
+221,7
@@
class RebuildRecentchanges extends Maintenance {
} else {
# No previous edit
$lastOldId = 0;
} else {
# No previous edit
$lastOldId = 0;
- $lastSize =
null
;
+ $lastSize =
0
;
$new = 1; // probably true
}
}
$new = 1; // probably true
}
}
@@
-277,17
+277,17
@@
class RebuildRecentchanges extends Maintenance {
array_keys( $wgFilterLogTypes ),
[ 'create' ] );
array_keys( $wgFilterLogTypes ),
[ 'create' ] );
- $this->output( "Loading from user
, page,
and logging tables...\n" );
+ $this->output( "Loading from user and logging tables...\n" );
$commentQuery = $commentStore->getJoin( 'log_comment' );
$actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' );
$res = $dbw->select(
$commentQuery = $commentStore->getJoin( 'log_comment' );
$actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' );
$res = $dbw->select(
- [ 'logging'
, 'page'
] + $commentQuery['tables'] + $actorQuery['tables'],
+ [ 'logging' ] + $commentQuery['tables'] + $actorQuery['tables'],
[
'log_timestamp',
'log_namespace',
'log_title',
[
'log_timestamp',
'log_namespace',
'log_title',
- '
page_id
',
+ '
log_page
',
'log_type',
'log_action',
'log_id',
'log_type',
'log_action',
'log_id',
@@
-302,10
+302,7
@@
class RebuildRecentchanges extends Maintenance {
],
__METHOD__,
[ 'ORDER BY' => 'log_timestamp DESC' ],
],
__METHOD__,
[ 'ORDER BY' => 'log_timestamp DESC' ],
- [
- 'page' =>
- [ 'LEFT JOIN', [ 'log_namespace=page_namespace', 'log_title=page_title' ] ]
- ] + $commentQuery['joins'] + $actorQuery['joins']
+ $commentQuery['joins'] + $actorQuery['joins']
);
$field = $dbw->fieldInfo( 'recentchanges', 'rc_cur_id' );
);
$field = $dbw->fieldInfo( 'recentchanges', 'rc_cur_id' );
@@
-330,8
+327,8
@@
class RebuildRecentchanges extends Maintenance {
'rc_type' => RC_LOG,
'rc_source' => RecentChange::SRC_LOG,
'rc_cur_id' => $field->isNullable()
'rc_type' => RC_LOG,
'rc_source' => RecentChange::SRC_LOG,
'rc_cur_id' => $field->isNullable()
- ? $row->
page_id
- : (int)$row->
page_id
, // NULL => 0,
+ ? $row->
log_page
+ : (int)$row->
log_page
, // NULL => 0,
'rc_log_type' => $row->log_type,
'rc_log_action' => $row->log_action,
'rc_logid' => $row->log_id,
'rc_log_type' => $row->log_type,
'rc_log_action' => $row->log_action,
'rc_logid' => $row->log_id,
@@
-375,7
+372,7
@@
class RebuildRecentchanges extends Maintenance {
[ 'ug_group' => $botgroups ],
__METHOD__,
[ 'DISTINCT' ],
[ 'ug_group' => $botgroups ],
__METHOD__,
[ 'DISTINCT' ],
- [ 'user_group' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
+ [ 'user_group
s
' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
);
$botusers = [];
);
$botusers = [];
@@
-428,7
+425,7
@@
class RebuildRecentchanges extends Maintenance {
[ 'ug_group' => $autopatrolgroups ],
__METHOD__,
[ 'DISTINCT' ],
[ 'ug_group' => $autopatrolgroups ],
__METHOD__,
[ 'DISTINCT' ],
- [ 'user_group' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
+ [ 'user_group
s
' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
);
foreach ( $res as $obj ) {
);
foreach ( $res as $obj ) {