diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2019-03-09 23:56:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2019-03-09 23:56:19 +0000 |
| commit | f1644aa1b0dd5a51c990907d3658ea9c33ec0dce (patch) | |
| tree | 72828622f5d1c082614a70c226a46973b21a9b55 | |
| parent | a73428bb88345af4a80e5edbf1357fbc0f6054c1 (diff) | |
| parent | d459d8de7519b65545fb3e25f8cde95b47d7e64c (diff) | |
| download | mediawikicore-f1644aa1b0dd5a51c990907d3658ea9c33ec0dce.tar.gz mediawikicore-f1644aa1b0dd5a51c990907d3658ea9c33ec0dce.zip | |
Merge "maintenance: Replace deprecated global $wgParser with getParser() service"
| -rw-r--r-- | maintenance/formatInstallDoc.php | 6 | ||||
| -rw-r--r-- | maintenance/preprocessDump.php | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/maintenance/formatInstallDoc.php b/maintenance/formatInstallDoc.php index 3d34be147767..160a20dcaf95 100644 --- a/maintenance/formatInstallDoc.php +++ b/maintenance/formatInstallDoc.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use MediaWiki\MediaWikiServices; + require_once __DIR__ . '/Maintenance.php'; /** @@ -61,10 +63,10 @@ class FormatInstallDoc extends Maintenance { $outText = InstallDocFormatter::format( $inText ); if ( $this->hasOption( 'html' ) ) { - global $wgParser; + $parser = MediaWikiServices::getInstance()->getParser(); $opt = new ParserOptions; $title = Title::newFromText( 'Text file' ); - $out = $wgParser->parse( $outText, $title, $opt ); + $out = $parser->parse( $outText, $title, $opt ); $outText = "<html><body>\n" . $out->getText() . "\n</body></html>\n"; } diff --git a/maintenance/preprocessDump.php b/maintenance/preprocessDump.php index f8526d0c330a..75904d0c68f5 100644 --- a/maintenance/preprocessDump.php +++ b/maintenance/preprocessDump.php @@ -25,6 +25,8 @@ * @ingroup Maintenance */ +use MediaWiki\MediaWikiServices; + require_once __DIR__ . '/dumpIterator.php'; /** @@ -40,9 +42,9 @@ class PreprocessDump extends DumpIterator { public $mPPNodeCount = 0; public function getStripList() { - global $wgParser; + $parser = MediaWikiServices::getInstance()->getParser(); - return $wgParser->getStripList(); + return $parser->getStripList(); } public function __construct() { |