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 "Make wgDisableAnonTalk disable anon links in automatic edit summaries"
[lhc/web/wiklou.git]
/
maintenance
/
rebuildFileCache.php
diff --git
a/maintenance/rebuildFileCache.php
b/maintenance/rebuildFileCache.php
index
1f89426
..
d484392
100644
(file)
--- a/
maintenance/rebuildFileCache.php
+++ b/
maintenance/rebuildFileCache.php
@@
-21,6
+21,8
@@
* @ingroup Maintenance
*/
* @ingroup Maintenance
*/
+use MediaWiki\MediaWikiServices;
+
require_once __DIR__ . '/Maintenance.php';
/**
require_once __DIR__ . '/Maintenance.php';
/**
@@
-41,18
+43,18
@@
class RebuildFileCache extends Maintenance {
}
public function finalSetup() {
}
public function finalSetup() {
- global $wg
DebugToolbar, $wg
UseFileCache;
+ global $wgUseFileCache;
$this->enabled = $wgUseFileCache;
// Script will handle capturing output and saving it itself
$wgUseFileCache = false;
$this->enabled = $wgUseFileCache;
// Script will handle capturing output and saving it itself
$wgUseFileCache = false;
- // Debug toolbar makes content uncacheable so we disable it.
- // Has to be done before Setup.php initialize MWDebug
- $wgDebugToolbar = false;
// Avoid DB writes (like enotif/counters)
MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode()
->setReason( 'Building cache' );
// Avoid DB writes (like enotif/counters)
MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode()
->setReason( 'Building cache' );
+ // Ensure no debug-specific logic ends up in the cache (must be after Setup.php)
+ MWDebug::deinit();
+
parent::finalSetup();
}
parent::finalSetup();
}
@@
-102,7
+104,8
@@
class RebuildFileCache extends Maintenance {
// Get the pages
$res = $dbr->select( 'page',
[ 'page_namespace', 'page_title', 'page_id' ],
// Get the pages
$res = $dbr->select( 'page',
[ 'page_namespace', 'page_title', 'page_id' ],
- [ 'page_namespace' => MWNamespace::getContentNamespaces(),
+ [ 'page_namespace' => MediaWikiServices::getInstance()->getNamespaceInfo()->
+ getContentNamespaces(),
"page_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ],
__METHOD__,
[ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ]
"page_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ],
__METHOD__,
[ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ]
@@
-113,7
+116,7
@@
class RebuildFileCache extends Maintenance {
$rebuilt = false;
$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
$rebuilt = false;
$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
- if (
null == $title
) {
+ if (
$title === null
) {
$this->output( "Page {$row->page_id} has bad title\n" );
continue; // broken title?
}
$this->output( "Page {$row->page_id} has bad title\n" );
continue; // broken title?
}