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

Removes unused variable

Browse Source 
Fixes typo in error message
This commit is contained in:
Vlad
2017-06-05 11:59:13 -04:00
parent 7f566fb672
commit 099db4e1c8
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,9 +40,6 @@ class Import {
$this->subscribers_custom_fields = $this->getCustomSubscribersFields( $this->subscribers_custom_fields = $this->getCustomSubscribersFields(
array_keys($data['columns']) array_keys($data['columns'])
); );
$this->default_subscribers_fields_validation_rules = array(
'email' => 'email'
);
$this->subscribers_fields_validation_rules = $this->getSubscriberDataValidationRules($data['columns']); $this->subscribers_fields_validation_rules = $this->getSubscriberDataValidationRules($data['columns']);
$this->subscribers_count = count(reset($this->subscribers_data)); $this->subscribers_count = count(reset($this->subscribers_data));
$this->created_at = date('Y-m-d H:i:s', (int)$data['timestamp']); $this->created_at = date('Y-m-d H:i:s', (int)$data['timestamp']);
@@ -89,7 +86,7 @@ class Import {
$this->subscribers_fields_validation_rules $this->subscribers_fields_validation_rules
); );
if(!$subscribers_data) { if(!$subscribers_data) {
throw new \Exception(__('No valid subscribers were founds.', 'mailpoet')); throw new \Exception(__('No valid subscribers were found.', 'mailpoet'));
} }
// permanently trash deleted subscribers // permanently trash deleted subscribers
$this->deleteExistingTrashedSubscribers($subscribers_data); $this->deleteExistingTrashedSubscribers($subscribers_data);

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

@@ -136,7 +136,7 @@ class ImportTest extends MailPoetTest {
$import->process(); $import->process();
self::fail('No valid subscribers found exception not thrown.'); self::fail('No valid subscribers found exception not thrown.');
} catch(Exception $e) { } catch(Exception $e) {
expect($e->getMessage())->equals('No valid subscribers were founds.'); expect($e->getMessage())->equals('No valid subscribers were found.');
} }
} }