Albert221 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398074 )
Change subject: Fix autoloading of ExportProgressFilter ...................................................................... Fix autoloading of ExportProgressFilter Bug: T177239 Change-Id: Ieb5d5aa78d569af8cd8f8bfa32ce10a33482cb84 --- M autoload.php A includes/export/ExportProgressFilter.php M maintenance/backup.inc 3 files changed, 27 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/398074/1 diff --git a/autoload.php b/autoload.php index cd01828..3869067 100644 --- a/autoload.php +++ b/autoload.php @@ -449,7 +449,7 @@ 'Exif' => __DIR__ . '/includes/media/Exif.php', 'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php', 'ExplodeIterator' => __DIR__ . '/includes/libs/ExplodeIterator.php', - 'ExportProgressFilter' => __DIR__ . '/maintenance/backup.inc', + 'ExportProgressFilter' => __DIR__ . '/includes/export/ExportProgressFilter.php', 'ExportSites' => __DIR__ . '/maintenance/exportSites.php', 'ExtensionJsonValidationError' => __DIR__ . '/includes/registration/ExtensionJsonValidationError.php', 'ExtensionJsonValidator' => __DIR__ . '/includes/registration/ExtensionJsonValidator.php', diff --git a/includes/export/ExportProgressFilter.php b/includes/export/ExportProgressFilter.php new file mode 100644 index 0000000..74d3492 --- /dev/null +++ b/includes/export/ExportProgressFilter.php @@ -0,0 +1,26 @@ +<?php + +/** + * @ingroup Dump + */ +class ExportProgressFilter extends DumpFilter { + /** + * @var BackupDumper + */ + private $progress; + + function __construct(&$sink, &$progress ) { + parent::__construct( $sink ); + $this->progress = $progress; + } + + function writeClosePage( $string ) { + parent::writeClosePage( $string ); + $this->progress->reportPage(); + } + + function writeRevision( $rev, $string ) { + parent::writeRevision( $rev, $string ); + $this->progress->revCount(); + } +} diff --git a/maintenance/backup.inc b/maintenance/backup.inc index 341a299..2bb5499 100644 --- a/maintenance/backup.inc +++ b/maintenance/backup.inc @@ -420,20 +420,3 @@ } } } - -class ExportProgressFilter extends DumpFilter { - function __construct( &$sink, &$progress ) { - parent::__construct( $sink ); - $this->progress = $progress; - } - - function writeClosePage( $string ) { - parent::writeClosePage( $string ); - $this->progress->reportPage(); - } - - function writeRevision( $rev, $string ) { - parent::writeRevision( $rev, $string ); - $this->progress->revCount(); - } -} -- To view, visit https://gerrit.wikimedia.org/r/398074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb5d5aa78d569af8cd8f8bfa32ce10a33482cb84 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Albert221 <w.albert...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits