| Index: trunk/phase3/includes/Export.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | * make additional queries to pull source data while the |
| 58 | 58 | * main query is still running. |
| 59 | 59 | * |
| 60 | | - * @param $db Database |
| | 60 | + * @param $db DatabaseBase |
| 61 | 61 | * @param $history Mixed: one of WikiExporter::FULL, WikiExporter::CURRENT, |
| 62 | 62 | * WikiExporter::RANGE or WikiExporter::STABLE, |
| 63 | 63 | * or an associative array: |
| — | — | @@ -682,7 +682,7 @@ |
| 683 | 683 | * canonical namespace. This skips any special-casing such as gendered |
| 684 | 684 | * user namespaces -- which while useful, are not yet listed in the |
| 685 | 685 | * XML <siteinfo> data so are unsafe in export. |
| 686 | | - * |
| | 686 | + * |
| 687 | 687 | * @param Title $title |
| 688 | 688 | * @return string |
| 689 | 689 | */ |
| — | — | @@ -897,8 +897,6 @@ |
| 898 | 898 | * @ingroup Dump |
| 899 | 899 | */ |
| 900 | 900 | class Dump7ZipOutput extends DumpPipeOutput { |
| 901 | | - protected $filename; |
| 902 | | - |
| 903 | 901 | function __construct( $file ) { |
| 904 | 902 | $command = $this->setup7zCommand( $file ); |
| 905 | 903 | parent::__construct( $command ); |
| — | — | @@ -913,10 +911,6 @@ |
| 914 | 912 | return( $command ); |
| 915 | 913 | } |
| 916 | 914 | |
| 917 | | - function closeRenameAndReopen( $newname ) { |
| 918 | | - $this->closeAndRename( $newname, true ); |
| 919 | | - } |
| 920 | | - |
| 921 | 915 | function closeAndRename( $newname, $open = false ) { |
| 922 | 916 | $newname = $this->checkRenameArgCount( $newname ); |
| 923 | 917 | if ( $newname ) { |
| — | — | @@ -924,7 +918,7 @@ |
| 925 | 919 | proc_close( $this->procOpenResource ); |
| 926 | 920 | $this->renameOrException( $newname ); |
| 927 | 921 | if ( $open ) { |
| 928 | | - $command = $this->setup7zCommand( $file ); |
| | 922 | + $command = $this->setup7zCommand( $this->filename ); |
| 929 | 923 | $this->startCommand( $command ); |
| 930 | 924 | } |
| 931 | 925 | } |