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 "mediawiki.searchSuggest: Add support for search namespace preferences"
[lhc/web/wiklou.git]
/
maintenance
/
populateContentModel.php
diff --git
a/maintenance/populateContentModel.php
b/maintenance/populateContentModel.php
index
7d83180
..
74a918a
100644
(file)
--- a/
maintenance/populateContentModel.php
+++ b/
maintenance/populateContentModel.php
@@
-24,6
+24,7
@@
require_once __DIR__ . '/Maintenance.php';
use Wikimedia\Rdbms\IDatabase;
require_once __DIR__ . '/Maintenance.php';
use Wikimedia\Rdbms\IDatabase;
+use MediaWiki\MediaWikiServices;
/**
* Usage:
/**
* Usage:
@@
-45,9
+46,8
@@
class PopulateContentModel extends Maintenance {
public function execute() {
$dbw = $this->getDB( DB_MASTER );
public function execute() {
$dbw = $this->getDB( DB_MASTER );
- $this->wikiId = $dbw->getWikiID();
-
- $this->wanCache = ObjectCache::getMainWANInstance();
+ $this->wikiId = $dbw->getDomainID();
+ $this->wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache();
$ns = $this->getOption( 'ns' );
if ( !ctype_digit( $ns ) && $ns !== 'all' ) {
$ns = $this->getOption( 'ns' );
if ( !ctype_digit( $ns ) && $ns !== 'all' ) {