X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fincludes%2FBackupDumper.php;h=45786d8da0953c13305443f54641028301e82650;hb=b7cd670cb7b2bf58ff4ab9db845d0bee0301b6cc;hp=4c2b64c9035045ce7cac9f93f8f1dba4d8e6f126;hpb=214c735ce4af6cc491c17d1ef2bf3829e75dde45;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/includes/BackupDumper.php b/maintenance/includes/BackupDumper.php index 4c2b64c903..45786d8da0 100644 --- a/maintenance/includes/BackupDumper.php +++ b/maintenance/includes/BackupDumper.php @@ -74,9 +74,6 @@ abstract class BackupDumper extends Maintenance { /** @var LoadBalancer */ protected $lb; - // @todo Unused? - private $stubText = false; // include rev_text_id instead of text; for 2-pass dump - /** * @param array|null $args For backward compatibility */ @@ -165,15 +162,12 @@ abstract class BackupDumper extends Maintenance { switch ( $opt ) { case 'plugin': - $val = explode( ':', $param ); + $val = explode( ':', $param, 2 ); if ( count( $val ) === 1 ) { $this->loadPlugin( $val[0], '' ); } elseif ( count( $val ) === 2 ) { $this->loadPlugin( $val[0], $val[1] ); - } else { - $this->fatalError( 'Invalid plugin parameter' ); - return; } break; @@ -202,7 +196,7 @@ abstract class BackupDumper extends Maintenance { $sink = new DumpOutput(); } - $split = explode( ':', $param ); + $split = explode( ':', $param, 2 ); $key = $split[0]; if ( !isset( $this->filterTypes[$key] ) ) { @@ -215,8 +209,6 @@ abstract class BackupDumper extends Maintenance { $filter = new $type( $sink ); } elseif ( count( $split ) === 2 ) { $filter = new $type( $sink, $split[1] ); - } else { - $this->fatalError( 'Invalid filter parameter' ); } // references are lame in php... @@ -358,9 +350,7 @@ abstract class BackupDumper extends Maintenance { function backupServer() { global $wgDBserver; - return $this->server - ? $this->server - : $wgDBserver; + return $this->server ?: $wgDBserver; } function reportPage() {