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

Merge pull request #294 from mailpoet/mailchimp_import_fix

Browse Source 
Fixes MailChimp import error
This commit is contained in:
Tautvidas Sipavičius
2016-01-22 12:20:44 +02:00
parent 7bd25660df 6a9313107c
commit 3f2f0ec1a9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/subscribers/importExport/import.js
View File

@@ -721,7 +721,7 @@ define(
} }
}); });
// reduce subscribers object if the total length is geater than the // reduce subscribers object if the total length is greater than the
// maximum number of defined rows // maximum number of defined rows
if (subscribers.subscribersCount > (maxRowsToShow + 1)) { if (subscribers.subscribersCount > (maxRowsToShow + 1)) {
subscribers.subscribers.splice( subscribers.subscribers.splice(

2
lib/Subscribers/ImportExport/Import/MailChimp.php
View File

@@ -113,7 +113,7 @@ class MailChimp {
'invalid' => false, 'invalid' => false,
'duplicate' => false, 'duplicate' => false,
'header' => $header, 'header' => $header,
'count' => count($subscribers) 'subscribersCount' => count($subscribers)
) )
); );
} }

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

@@ -58,7 +58,7 @@ class MailChimpCest {
expect(isset($subscribers['data']['duplicate']))->true(); expect(isset($subscribers['data']['duplicate']))->true();
expect(isset($subscribers['data']['header']))->true(); expect(isset($subscribers['data']['header']))->true();
expect(count($subscribers['data']['subscribers']))->equals(1); expect(count($subscribers['data']['subscribers']))->equals(1);
expect($subscribers['data']['count'])->equals(1); expect($subscribers['data']['subscribersCount'])->equals(1);
} }
function itFailsWhenListHeadersDontMatch() { function itFailsWhenListHeadersDontMatch() {