Fix infinite loop caused by wrongly incremented step

htmlburger · Feb 16, 2018 · 5a39b21 · 5a39b21
1 parent dd56a31
commit 5a39b21
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Import_Page.php b/src/Import_Page.php
@@ -227,11 +227,16 @@ public function start() {
 		$imported_rows = [];
 
 		$csv = $this->import_process->get_csv();
-		$start_row = ( intval( $this->step ) === 1 && $this->import_process->first_row_header ) ? 1 : ( $this->step - 1 ) * $this->settings['rows_per_request'];
+		$total_rows = $csv->count();
+		$start_row = ( intval( $this->step ) === 1 && $this->import_process->first_row_header ) ? 1 : ( $this->step - 1 ) * $this->settings['rows_per_request'] + 1;
 		$csv->skip_to_row( $start_row );
 
 		$row_number = 0;
 		foreach ($csv as $row) {
+			if ( $start_row > $total_rows ) {
+				break;
+			}
+
 			try {
 				$import_status = $this->import_process->import_row($row);
 			} catch (\Exception $e) {