| Index: trunk/phase3/maintenance/backup.inc |
| — | — | @@ -50,6 +50,7 @@ |
| 51 | 51 | var $sink = null; // Output filters |
| 52 | 52 | var $stubText = false; // include rev_text_id instead of text; for 2-pass dump |
| 53 | 53 | var $dumpUploads = false; |
| | 54 | + var $dumpUploadFileContents = false; |
| 54 | 55 | |
| 55 | 56 | function BackupDumper( $args ) { |
| 56 | 57 | $this->stderr = fopen( "php://stderr", "wt" ); |
| — | — | @@ -187,6 +188,7 @@ |
| 188 | 189 | $db = $this->backupDb(); |
| 189 | 190 | $exporter = new WikiExporter( $db, $history, WikiExporter::STREAM, $text ); |
| 190 | 191 | $exporter->dumpUploads = $this->dumpUploads; |
| | 192 | + $exporter->dumpUploadFileContents = $this->dumpUploadFileContents; |
| 191 | 193 | |
| 192 | 194 | $wrapper = new ExportProgressFilter( $this->sink, $this ); |
| 193 | 195 | $exporter->setOutputSink( $wrapper ); |
| Index: trunk/phase3/maintenance/dumpBackup.php |
| — | — | @@ -59,6 +59,7 @@ |
| 60 | 60 | $dumper->skipHeader = isset( $options['skip-header'] ); |
| 61 | 61 | $dumper->skipFooter = isset( $options['skip-footer'] ); |
| 62 | 62 | $dumper->dumpUploads = isset( $options['uploads'] ); |
| | 63 | +$dumper->dumpUploadFileContents = isset( $options['include-files'] ); |
| 63 | 64 | |
| 64 | 65 | $textMode = isset( $options['stub'] ) ? WikiExporter::STUB : WikiExporter::TEXT; |
| 65 | 66 | |
| — | — | @@ -96,7 +97,8 @@ |
| 97 | 98 | --skip-header Don't output the <mediawiki> header |
| 98 | 99 | --skip-footer Don't output the </mediawiki> footer |
| 99 | 100 | --stub Don't perform old_text lookups; for 2-pass dump |
| 100 | | - --uploads Include upload records (experimental) |
| | 101 | + --uploads Include upload records without files |
| | 102 | + --include-files Include files within the XML stream |
| 101 | 103 | --conf=<file> Use the specified configuration file (LocalSettings.php) |
| 102 | 104 | |
| 103 | 105 | --wiki=<wiki> Only back up the specified <wiki> |