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 "Delete autoload.ide.php"
[lhc/web/wiklou.git]
/
maintenance
/
dumpTextPass.php
diff --git
a/maintenance/dumpTextPass.php
b/maintenance/dumpTextPass.php
index
59a6b51
..
e1df1f1
100644
(file)
--- a/
maintenance/dumpTextPass.php
+++ b/
maintenance/dumpTextPass.php
@@
-100,7
+100,7
@@
class TextPassDumper extends BackupDumper {
protected $db;
/**
protected $db;
/**
- * @param array $args For backward compatibility
+ * @param array
|null
$args For backward compatibility
*/
function __construct( $args = null ) {
parent::__construct();
*/
function __construct( $args = null ) {
parent::__construct();
@@
-705,7
+705,6
@@
TEXT
* @throws MWException
*/
private function getTextDb( $id ) {
* @throws MWException
*/
private function getTextDb( $id ) {
- global $wgContLang;
if ( !isset( $this->db ) ) {
throw new MWException( __METHOD__ . "No database available" );
}
if ( !isset( $this->db ) ) {
throw new MWException( __METHOD__ . "No database available" );
}
@@
-718,7
+717,8
@@
TEXT
return false;
}
$stripped = str_replace( "\r", "", $text );
return false;
}
$stripped = str_replace( "\r", "", $text );
- $normalized = $wgContLang->normalize( $stripped );
+ $normalized = MediaWikiServices::getInstance()->getContentLanguage()->
+ normalize( $stripped );
return $normalized;
}
return $normalized;
}
@@
-797,8
+797,6
@@
TEXT
}
private function getTextSpawnedOnce( $id ) {
}
private function getTextSpawnedOnce( $id ) {
- global $wgContLang;
-
$ok = fwrite( $this->spawnWrite, "$id\n" );
// $this->progress( ">> $id" );
if ( !$ok ) {
$ok = fwrite( $this->spawnWrite, "$id\n" );
// $this->progress( ">> $id" );
if ( !$ok ) {
@@
-853,7
+851,8
@@
TEXT
// Do normalization in the dump thread...
$stripped = str_replace( "\r", "", $text );
// Do normalization in the dump thread...
$stripped = str_replace( "\r", "", $text );
- $normalized = $wgContLang->normalize( $stripped );
+ $normalized = MediaWikiServices::getInstance()->getContentLanguage()->
+ normalize( $stripped );
return $normalized;
}
return $normalized;
}