* Fix PHP notice and estimates for dumpBackup.php and friends

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a0e109b..119c6d7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -30,7 +30,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   because it seems to be unused.
 * (bug 7139) Increasing the visual width of the edit summary field on larger
   screen sizes, for the default monobook skin.
-
+* Fix PHP notice and estimates for dumpBackup.php and friends
 
 
 == Languages updated ==

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index d40636a..8b4b672 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -203,11 +203,11 @@ class BackupDumper {
         * Initialise starting time and maximum revision count.
         * We'll make ETA calculations based an progress, assuming relatively
         * constant per-revision rate.
-        * @param int $history MW_EXPORT_CURRENT or MW_EXPORT_FULL
+        * @param int $history WikiExporter::CURRENT or WikiExporter::FULL
         */
-       function initProgress( $history = MW_EXPORT_FULL ) {
-               $table = ($history == MW_EXPORT_CURRENT) ? 'page' : 'revision';
-               $field = ($history == MW_EXPORT_CURRENT) ? 'page_id' : 'rev_id';
+       function initProgress( $history = WikiExporter::FULL ) {
+               $table = ($history == WikiExporter::CURRENT) ? 'page' : 'revision';
+               $field = ($history == WikiExporter::CURRENT) ? 'page_id' : 'rev_id';
                
                $dbr =& wfGetDB( DB_SLAVE );
                $this->maxCount = $dbr->selectField( $table, "MAX($field)", '', 'BackupDumper::dump' );