summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Ryan2011-04-11 19:22:29 (GMT)
committer Mike Ryan2011-04-11 19:22:29 (GMT)
commit467a74e10da4665d996c7097e285e3d404e34730 (patch)
tree4ae6afb4c9fdc5208b5fa63054fcae6a6f3f0993
parent75d5029aaec98f837eb8a35eae134037a9dfd637 (diff)
Issue #1117602 by mikeryan: Bad counts reported on bulk rollback
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/migration.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b7f99d9..b91cdcf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,7 @@ Features and enhancements
- #1101592 - Replace --itemlimit with --limit, supporting time limits as well.
Bug fixes
+- #1117602 - Bad counts reported on bulk rollback.
- #1118480 - Document _name arguments to file fields.
- #1108700 - Remove obsolete references to prepare().
- #1107546 - Check file presence with is_file() instead of file_exists().
diff --git a/includes/migration.inc b/includes/migration.inc
index e7582ea..abdd4f7 100644
--- a/includes/migration.inc
+++ b/includes/migration.inc
@@ -405,11 +405,11 @@ abstract class Migration extends MigrationBase {
}
$destids = array();
$sourceids = array();
- $batch_count = 0;
// Will increment even if there was an exception... But we don't
// really have a way to know how many really were successfully rolled back
$this->total_processed += $batch_count;
$this->processed_since_feedback += $batch_count;
+ $batch_count = 0;
}
}
if ($batch_count > 0) {