diff --git a/lib/Subscribers/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php index 8eb983e703..99adb767b3 100644 --- a/lib/Subscribers/ImportExport/Import/Import.php +++ b/lib/Subscribers/ImportExport/Import/Import.php @@ -93,7 +93,7 @@ class Import { 'fields' => $this->subscribers_fields ); list($existing_subscribers['data'], $new_subscribers['data'], $wp_users) = - $this->splitSubscribersData($subscribers_data, $this->subscribers_fields); + $this->splitSubscribersData($subscribers_data); $subscribers_data = null; // create or update subscribers @@ -219,9 +219,7 @@ class Import { } $new_subscribers = $subscribers_data; // reindex array after unsetting elements - array_walk($new_subscribers, function(&$values) { - sort($values); - }); + $new_subscribers = array_map('array_values', $new_subscribers); // remove empty values $new_subscribers = array_filter($new_subscribers); return array( diff --git a/tests/unit/Subscribers/ImportExport/Import/ImportTest.php b/tests/unit/Subscribers/ImportExport/Import/ImportTest.php index 2cedf2325a..1594b8ce47 100644 --- a/tests/unit/Subscribers/ImportExport/Import/ImportTest.php +++ b/tests/unit/Subscribers/ImportExport/Import/ImportTest.php @@ -114,7 +114,7 @@ class ImportTest extends MailPoetTest { )); $subscriber->save(); list($existing_subscribers, $new_subscribers, $wp_users, ) = $this->import->splitSubscribersData( - $this->subscribers_data, $this->subscribers_fields + $this->subscribers_data ); expect($existing_subscribers['email'][0])->equals($this->subscribers_data['email'][0]); expect($new_subscribers['email'][0])->equals($this->subscribers_data['email'][1]);