X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportTextFiles.php;h=816e745281d846c091b76c358219e234204a45ae;hb=005802b82b106605a928394c859248c2f47f93bb;hp=5531ffc3afb0e124e843110c0d8ea2177979e578;hpb=0687f250d6fb4196a7aa60af4fe11c7d21f3c455;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/importTextFiles.php b/maintenance/importTextFiles.php index 5531ffc3af..816e745281 100644 --- a/maintenance/importTextFiles.php +++ b/maintenance/importTextFiles.php @@ -21,6 +21,8 @@ * @ingroup Maintenance */ +use MediaWiki\MediaWikiServices; + require_once __DIR__ . '/Maintenance.php'; /** @@ -103,16 +105,16 @@ class ImportTextFiles extends Maintenance { $timestamp = $useTimestamp ? wfTimestamp( TS_UNIX, filemtime( $file ) ) : wfTimestampNow(); $title = Title::newFromText( $pageName ); - $exists = $title->exists(); - $oldRevID = $title->getLatestRevID(); - $oldRev = $oldRevID ? Revision::newFromId( $oldRevID ) : null; - - if ( !$title ) { + // Have to check for # manually, since it gets interpreted as a fragment + if ( !$title || $title->hasFragment() ) { $this->error( "Invalid title $pageName. Skipping.\n" ); $skipCount++; continue; } + $exists = $title->exists(); + $oldRevID = $title->getLatestRevID(); + $oldRev = $oldRevID ? Revision::newFromId( $oldRevID ) : null; $actualTitle = $title->getPrefixedText(); if ( $exists ) { @@ -129,7 +131,7 @@ class ImportTextFiles extends Maintenance { } } - $rev = new WikiRevision( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) ); + $rev = new WikiRevision( MediaWikiServices::getInstance()->getMainConfig() ); $rev->setText( rtrim( $text ) ); $rev->setTitle( $title ); $rev->setUserObj( $user );