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 "Use HTML::hidden to create input fields"
[lhc/web/wiklou.git]
/
maintenance
/
rebuildrecentchanges.php
diff --git
a/maintenance/rebuildrecentchanges.php
b/maintenance/rebuildrecentchanges.php
index
6465bb3
..
5df432e
100644
(file)
--- a/
maintenance/rebuildrecentchanges.php
+++ b/
maintenance/rebuildrecentchanges.php
@@
-24,6
+24,7
@@
*/
require_once __DIR__ . '/Maintenance.php';
*/
require_once __DIR__ . '/Maintenance.php';
+use MediaWiki\MediaWikiServices;
/**
* Maintenance script that rebuilds recent changes from scratch.
/**
* Maintenance script that rebuilds recent changes from scratch.
@@
-155,9
+156,7
@@
class RebuildRecentchanges extends Maintenance {
'rc_this_oldid' => $row->rev_id,
'rc_last_oldid' => 0, // is this ok?
'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT,
'rc_this_oldid' => $row->rev_id,
'rc_last_oldid' => 0, // is this ok?
'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT,
- 'rc_source' => $row->page_is_new
- ? $dbw->addQuotes( RecentChange::SRC_NEW )
- : $dbw->addQuotes( RecentChange::SRC_EDIT )
+ 'rc_source' => $row->page_is_new ? RecentChange::SRC_NEW : RecentChange::SRC_EDIT
,
'rc_deleted' => $row->rev_deleted
],
,
'rc_deleted' => $row->rev_deleted
],
@@
-238,9
+237,7
@@
class RebuildRecentchanges extends Maintenance {
'rc_last_oldid' => $lastOldId,
'rc_new' => $new,
'rc_type' => $new ? RC_NEW : RC_EDIT,
'rc_last_oldid' => $lastOldId,
'rc_new' => $new,
'rc_type' => $new ? RC_NEW : RC_EDIT,
- 'rc_source' => $new === 1
- ? $dbw->addQuotes( RecentChange::SRC_NEW )
- : $dbw->addQuotes( RecentChange::SRC_EDIT ),
+ 'rc_source' => $new === 1 ? RecentChange::SRC_NEW : RecentChange::SRC_EDIT,
'rc_old_len' => $lastSize,
'rc_new_len' => $size,
],
'rc_old_len' => $lastSize,
'rc_new_len' => $size,
],
@@
-304,6
+301,8
@@
class RebuildRecentchanges extends Maintenance {
]
);
]
);
+ $field = $dbw->fieldInfo( 'recentchanges', 'rc_cur_id' );
+
$inserted = 0;
foreach ( $res as $row ) {
$dbw->insert(
$inserted = 0;
foreach ( $res as $row ) {
$dbw->insert(
@@
-322,8
+321,8
@@
class RebuildRecentchanges extends Maintenance {
'rc_this_oldid' => 0,
'rc_last_oldid' => 0,
'rc_type' => RC_LOG,
'rc_this_oldid' => 0,
'rc_last_oldid' => 0,
'rc_type' => RC_LOG,
- 'rc_source' =>
$dbw->addQuotes( RecentChange::SRC_LOG )
,
- 'rc_cur_id' => $
dbw->cascadingDeletes
()
+ 'rc_source' =>
RecentChange::SRC_LOG
,
+ 'rc_cur_id' => $
field->isNullable
()
? $row->page_id
: (int)$row->page_id, // NULL => 0,
'rc_log_type' => $row->log_type,
? $row->page_id
: (int)$row->page_id, // NULL => 0,
'rc_log_type' => $row->log_type,
@@
-476,15
+475,16
@@
class RebuildRecentchanges extends Maintenance {
}
/**
}
/**
- * Purge cached feeds in $
messageMemc
+ * Purge cached feeds in $
wanCache
*/
private function purgeFeeds() {
*/
private function purgeFeeds() {
- global $wgFeedClasses
, $messageMemc
;
+ global $wgFeedClasses;
$this->output( "Deleting feed timestamps.\n" );
$this->output( "Deleting feed timestamps.\n" );
+ $wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache();
foreach ( $wgFeedClasses as $feed => $className ) {
foreach ( $wgFeedClasses as $feed => $className ) {
- $
messageMemc->delete( wfMemc
Key( 'rcfeed', $feed, 'timestamp' ) ); # Good enough for now.
+ $
wanCache->delete( $wanCache->make
Key( 'rcfeed', $feed, 'timestamp' ) ); # Good enough for now.
}
}
}
}
}
}