Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge branch 'import_fixes' of mailpoet:mailpoet/mailpoet into import_fixes

Browse Source
This commit is contained in:
Vlad
2017-04-13 09:41:46 -04:00
parent aa15b9420a bee9bfcfcc
commit ac574acf8e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Subscribers/ImportExport/Import/Import.php
View File

@@ -93,7 +93,7 @@ class Import {
'fields' => $this->subscribers_fields 'fields' => $this->subscribers_fields
); );
list($existing_subscribers['data'], $new_subscribers['data'], $wp_users) = list($existing_subscribers['data'], $new_subscribers['data'], $wp_users) =
$this->splitSubscribersData($subscribers_data, $this->subscribers_fields); $this->splitSubscribersData($subscribers_data);
$subscribers_data = null; $subscribers_data = null;
// create or update subscribers // create or update subscribers
@@ -219,9 +219,7 @@ class Import {
} }
$new_subscribers = $subscribers_data; $new_subscribers = $subscribers_data;
// reindex array after unsetting elements // reindex array after unsetting elements
array_walk($new_subscribers, function(&$values) { $new_subscribers = array_map('array_values', $new_subscribers);
sort($values);
});
// remove empty values // remove empty values
$new_subscribers = array_filter($new_subscribers); $new_subscribers = array_filter($new_subscribers);
return array( return array(

2
tests/unit/Subscribers/ImportExport/Import/ImportTest.php
View File

@@ -114,7 +114,7 @@ class ImportTest extends MailPoetTest {
)); ));
$subscriber->save(); $subscriber->save();
list($existing_subscribers, $new_subscribers, $wp_users, ) = $this->import->splitSubscribersData( 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($existing_subscribers['email'][0])->equals($this->subscribers_data['email'][0]);
expect($new_subscribers['email'][0])->equals($this->subscribers_data['email'][1]); expect($new_subscribers['email'][0])->equals($this->subscribers_data['email'][1]);