MailPoet Newsletters (Previous) - Version 2.6.13

Version Description

  • 2014-10-28 =
  • Improved security a lot since July 2014, please update.
  • Fixed a conflict with the plugin Magic Action Box
  • Fixed blank export file when exporting subscribers with custom fields
  • Fixed the default subscribers ordering in the backend, we now display the most recent first
  • Fixed the bug on Bold and Italic commands in our newsletter editor
  • Fixed an issue on the new bulk resend confirmation email feature
  • Fixed bounce management issue (Premium only), counting until 3 when a mailbox is full
  • Fixing 1 bug a day, stopped eating our veggies
Download this release

Release Info

Developer wysija
Plugin Icon 128x128 MailPoet Newsletters (Previous)
Version 2.6.13
Comparing to
See all releases

Code changes from version 2.6.12 to 2.6.13

Files changed (79) hide show
  1. classes/WJ_Export.php +1 -0
  2. controllers/back/subscribers.php +3 -3
  3. core/base.php +1 -1
  4. core/model.php +2 -2
  5. helpers/bounce.php +14 -11
  6. helpers/render_engine.php +5 -2
  7. helpers/wj_engine.php +1 -1
  8. index.php +1 -1
  9. languages/wysija-newsletters-ach.mo +0 -0
  10. languages/wysija-newsletters-af.mo +0 -0
  11. languages/wysija-newsletters-ar.mo +0 -0
  12. languages/wysija-newsletters-bg_BG.mo +0 -0
  13. languages/wysija-newsletters-bn_BD.mo +0 -0
  14. languages/wysija-newsletters-bs_BA.mo +0 -0
  15. languages/wysija-newsletters-ca.mo +0 -0
  16. languages/wysija-newsletters-ca@valencia.mo +0 -0
  17. languages/wysija-newsletters-ca_ES.mo +0 -0
  18. languages/wysija-newsletters-cs_CZ.mo +0 -0
  19. languages/wysija-newsletters-da_DK.mo +0 -0
  20. languages/wysija-newsletters-de_AT.mo +0 -0
  21. languages/wysija-newsletters-de_DE.mo +0 -0
  22. languages/wysija-newsletters-el.mo +0 -0
  23. languages/wysija-newsletters-en_GB.mo +0 -0
  24. languages/wysija-newsletters-es.mo +0 -0
  25. languages/wysija-newsletters-es_419.mo +0 -0
  26. languages/wysija-newsletters-es_AR.mo +0 -0
  27. languages/wysija-newsletters-es_ES.mo +0 -0
  28. languages/wysija-newsletters-et.mo +0 -0
  29. languages/wysija-newsletters-eu.mo +0 -0
  30. languages/wysija-newsletters-eu_ES.mo +0 -0
  31. languages/wysija-newsletters-fa.mo +0 -0
  32. languages/wysija-newsletters-fa_IR.mo +0 -0
  33. languages/wysija-newsletters-fi.mo +0 -0
  34. languages/wysija-newsletters-fr_FR.mo +0 -0
  35. languages/wysija-newsletters-ga.mo +0 -0
  36. languages/wysija-newsletters-gl_ES.mo +0 -0
  37. languages/wysija-newsletters-he_IL.mo +0 -0
  38. languages/wysija-newsletters-hi_IN.mo +0 -0
  39. languages/wysija-newsletters-hr_HR.mo +0 -0
  40. languages/wysija-newsletters-hu_HU.mo +0 -0
  41. languages/wysija-newsletters-hy_AM.mo +0 -0
  42. languages/wysija-newsletters-id.mo +0 -0
  43. languages/wysija-newsletters-it_IT.mo +0 -0
  44. languages/wysija-newsletters-ja.mo +0 -0
  45. languages/wysija-newsletters-ko_KR.mo +0 -0
  46. languages/wysija-newsletters-lt_LT.mo +0 -0
  47. languages/wysija-newsletters-lv.mo +0 -0
  48. languages/wysija-newsletters-lv_LV.mo +0 -0
  49. languages/wysija-newsletters-mk_MK.mo +0 -0
  50. languages/wysija-newsletters-my_MM.mo +0 -0
  51. languages/wysija-newsletters-nb_NO.mo +0 -0
  52. languages/wysija-newsletters-nl_BE.mo +0 -0
  53. languages/wysija-newsletters-nl_NL.mo +0 -0
  54. languages/wysija-newsletters-oc.mo +0 -0
  55. languages/wysija-newsletters-pl_PL.mo +0 -0
  56. languages/wysija-newsletters-pt_BR.mo +0 -0
  57. languages/wysija-newsletters-pt_PT.mo +0 -0
  58. languages/wysija-newsletters-ro_RO.mo +0 -0
  59. languages/wysija-newsletters-ru_RU.mo +0 -0
  60. languages/wysija-newsletters-sk_SK.mo +0 -0
  61. languages/wysija-newsletters-sl_SI.mo +0 -0
  62. languages/wysija-newsletters-sq.mo +0 -0
  63. languages/wysija-newsletters-sr@latin.mo +0 -0
  64. languages/wysija-newsletters-sr_RS.mo +0 -0
  65. languages/wysija-newsletters-sr_RS@latin.mo +0 -0
  66. languages/wysija-newsletters-sv_SE.mo +0 -0
  67. languages/wysija-newsletters-tr_TR.mo +0 -0
  68. languages/wysija-newsletters-uk.mo +0 -0
  69. languages/wysija-newsletters-ur_PK.mo +0 -0
  70. languages/wysija-newsletters-vi.mo +0 -0
  71. languages/wysija-newsletters-zh_CN.mo +0 -0
  72. languages/wysija-newsletters-zh_HK.mo +0 -0
  73. languages/wysija-newsletters-zh_TW.mo +0 -0
  74. models/user.php +11 -1
  75. models/user_list.php +0 -1
  76. readme.txt +12 -2
  77. tools/styles/css-editor.html +1 -1
  78. views/back/campaigns.php +1 -0
  79. views/front.php +0 -1
classes/WJ_Export.php CHANGED
@@ -155,6 +155,7 @@ class WJ_Export extends WYSIJA_object {
155
  $this->_user_ids = null; // free memory
156
 
157
  $model_user = WYSIJA::get( 'user', 'model' );
 
158
  foreach ( $user_ids_chunks as $user_id_chunk ) {
159
  // get the full data for that specific chunk of ids
160
  $data = $model_user->get( $this->_fields, array( 'user_id' => $user_id_chunk ) );
155
  $this->_user_ids = null; // free memory
156
 
157
  $model_user = WYSIJA::get( 'user', 'model' );
158
+ $model_user->refresh_columns();
159
  foreach ( $user_ids_chunks as $user_id_chunk ) {
160
  // get the full data for that specific chunk of ids
161
  $data = $model_user->get( $this->_fields, array( 'user_id' => $user_id_chunk ) );
controllers/back/subscribers.php CHANGED
@@ -524,8 +524,8 @@ class WYSIJA_control_back_subscribers extends WYSIJA_control_back{
524
  }
525
  }
526
  } else {
527
- $user_ids = $_POST['wysija']['user']['user_id'];
528
- }
529
 
530
  $sending_statuses = array();// array(user_id => 1/0)
531
  if (!empty($user_ids)) {
@@ -542,7 +542,7 @@ class WYSIJA_control_back_subscribers extends WYSIJA_control_back{
542
  if ($success_sending_number <= 0) {
543
  $this->notice(__('No email sent.',WYSIJA));
544
  } else {
545
- $this->notice( _n( 'One email has been sent.', '%d emails have been sent to unconfirmed subscribers.', $success_sending_number, WYSIJA ) );
546
  }
547
 
548
  $this->redirect_after_bulk_action();
524
  }
525
  }
526
  } else {
527
+ $user_ids = array_filter($_POST['wysija']['user']['user_id'], 'ctype_digit');
528
+ }
529
 
530
  $sending_statuses = array();// array(user_id => 1/0)
531
  if (!empty($user_ids)) {
542
  if ($success_sending_number <= 0) {
543
  $this->notice(__('No email sent.',WYSIJA));
544
  } else {
545
+ $this->notice( sprintf(_n( 'One email has been sent.', '%d emails have been sent to unconfirmed subscribers.', (int)$success_sending_number, WYSIJA ), $success_sending_number ) );
546
  }
547
 
548
  $this->redirect_after_bulk_action();
core/base.php CHANGED
@@ -19,7 +19,7 @@ class WYSIJA_object{
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
- static $version = '2.6.12';
23
 
24
  function WYSIJA_object(){
25
 
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
+ static $version = '2.6.13';
23
 
24
  function WYSIJA_object(){
25
 
core/model.php CHANGED
@@ -739,13 +739,13 @@ class WYSIJA_model extends WYSIJA_object{
739
  function validateFields(){
740
  $error=false;
741
  foreach($this->values as $key =>$val){
742
- if(isset($this->columns[$key]['req']) && !$val && $this->columns[$key]['type']!='boolean'){
743
  $this->error(sprintf(__('Field "%1$s" is required in table "%2$s".',WYSIJA), $key,$this->table_name),true);
744
  $error=true;
745
  }
746
  /* let's correct the type of the values based on the one defined in the model*/
747
  switch($this->columns[$key]['type']){
748
- case "email":
749
  $userHelper = WYSIJA::get('user','helper');
750
  if(!$userHelper->validEmail($val)){
751
  $this->error(sprintf(__('Field "%1$s" needs to be a valid Email.',WYSIJA), $key),true);
739
  function validateFields(){
740
  $error=false;
741
  foreach($this->values as $key =>$val){
742
+ if(isset($this->columns[$key]['req']) && !$val && !in_array( $this->columns[$key]['type'], array( 'boolean', 'integer' )) ){
743
  $this->error(sprintf(__('Field "%1$s" is required in table "%2$s".',WYSIJA), $key,$this->table_name),true);
744
  $error=true;
745
  }
746
  /* let's correct the type of the values based on the one defined in the model*/
747
  switch($this->columns[$key]['type']){
748
+ case 'email':
749
  $userHelper = WYSIJA::get('user','helper');
750
  if(!$userHelper->validEmail($val)){
751
  $this->error(sprintf(__('Field "%1$s" needs to be a valid Email.',WYSIJA), $key),true);
helpers/bounce.php CHANGED
@@ -571,6 +571,20 @@ class WYSIJA_help_bounce extends WYSIJA_help {
571
  }
572
  }
573
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
574
  //IN WYSIJA THERE ARE 3 POSSIBILITIES
575
  //1-Delete user
576
  //2-Unsubscribe user
@@ -602,18 +616,7 @@ class WYSIJA_help_bounce extends WYSIJA_help {
602
 
603
 
604
 
605
- //Make sure we have enough messages to really execute this
606
- if (!empty($one_rule['action_user_min']) && $one_rule['action_user_min'] > 1) {
607
- //Let's load the number of bounces the user has and then exit or not...
608
- $modelEUS = WYSIJA::get('email_user_stat', 'model');
609
- $res = $modelEUS->query('get_row', 'SELECT COUNT(email_id) as count FROM [wysija]' . $modelEUS->table_name . ' WHERE status = -1 AND user_id = ' . $this->_message->user_id);
610
- $nb = intval($res['count']) + 1;
611
 
612
- if ($nb < $one_rule['action_user_min']) {
613
- $message .= ', ' . sprintf(__('We received %1$s messages from the user %2$s', WYSIJA), $nb, $this->_message->subemail) . ', ' . sprintf(__('Actions will be executed after %1$s messages', WYSIJA), $one_rule['action_user_min']);
614
- return $message;
615
- }
616
- }
617
 
618
  return $message;
619
  }
571
  }
572
  }
573
 
574
+
575
+ //Make sure we have enough messages to really execute this
576
+ if (!empty($one_rule['action_user_min']) && $one_rule['action_user_min'] > 1) {
577
+ //Let's load the number of bounces the user has and then exit or not...
578
+ $modelEUS = WYSIJA::get('email_user_stat', 'model');
579
+ $res = $modelEUS->query('get_row', 'SELECT COUNT(email_id) as count FROM [wysija]' . $modelEUS->table_name . ' WHERE status = -1 AND user_id = ' . $this->_message->user_id);
580
+ $nb = intval($res['count']) + 1;
581
+
582
+ if ($nb < $one_rule['action_user_min']) {
583
+ $message .= ', ' . sprintf(__('We received %1$s messages from the user %2$s', WYSIJA), $nb, $this->_message->subemail) . ', ' . sprintf(__('Actions will be executed after %1$s messages', WYSIJA), $one_rule['action_user_min']);
584
+ return $message;
585
+ }
586
+ }
587
+
588
  //IN WYSIJA THERE ARE 3 POSSIBILITIES
589
  //1-Delete user
590
  //2-Unsubscribe user
616
 
617
 
618
 
 
 
 
 
 
 
619
 
 
 
 
 
 
620
 
621
  return $message;
622
  }
helpers/render_engine.php CHANGED
@@ -105,8 +105,11 @@ class WYSIJA_help_render_engine extends WYSIJA_object {
105
  if (isset($vars['text-decoration'])) $result[] = 'text-decoration: ' . $vars['text-decoration'] . ';';
106
  if (isset($vars['outline'])) $result[] = 'outline: ' . $vars['outline'] . ';';
107
  if (isset($vars['height'])) $result[] = 'height: ' . $vars['height'] . ';';
108
- if (!isset($vars['border'])) $result[] = 'border: 0;';
109
- if (isset($vars['border'])) $result[] = 'border: ' . $vars['border']['size'] . ' ' . $vars['border']['style'] . ' ' . $vars['border']['color'] . ';';
 
 
 
110
  if (isset($vars['border-collapse'])) $result[] = 'border-collapse: ' . $vars['border-collapse'] . ';';
111
  if (isset($vars['mso-table-space'])) $result[] = 'mso-table-lspace: ' . $vars['mso-table-space'] . '; mso-table-rspace: ' . $vars['mso-table-space'] . ';';
112
  if (isset($vars['text-align'])) $result[] = 'text-align: ' . $vars['text-align'] . ';';
105
  if (isset($vars['text-decoration'])) $result[] = 'text-decoration: ' . $vars['text-decoration'] . ';';
106
  if (isset($vars['outline'])) $result[] = 'outline: ' . $vars['outline'] . ';';
107
  if (isset($vars['height'])) $result[] = 'height: ' . $vars['height'] . ';';
108
+ if (isset($vars['border']) && is_array($vars['border'])) {
109
+ $result[] = 'border: ' . $vars['border']['size'] . ' ' . $vars['border']['style'] . ' ' . $vars['border']['color'] . ';';
110
+ } else {
111
+ $result[] = 'border: 0;';
112
+ }
113
  if (isset($vars['border-collapse'])) $result[] = 'border-collapse: ' . $vars['border-collapse'] . ';';
114
  if (isset($vars['mso-table-space'])) $result[] = 'mso-table-lspace: ' . $vars['mso-table-space'] . '; mso-table-rspace: ' . $vars['mso-table-space'] . ';';
115
  if (isset($vars['text-align'])) $result[] = 'text-align: ' . $vars['text-align'] . ';';
helpers/wj_engine.php CHANGED
@@ -1507,7 +1507,7 @@ class WYSIJA_help_wj_engine extends WYSIJA_object {
1507
 
1508
  foreach($tags as $tag => $styles) {
1509
  $styles = $this->splitSpacing($styles);
1510
- $inlineStyles = $helper_render_engine->renderCSS(array_merge($styles, array('tag' => $tag)));
1511
  $tags['#< *'.$tag.'((?:(?!style).)*)>#Ui'] = '<'.$tag.' style="'.$inlineStyles.'"$1>';
1512
  unset($tags[$tag]);
1513
  }
1507
 
1508
  foreach($tags as $tag => $styles) {
1509
  $styles = $this->splitSpacing($styles);
1510
+ $inlineStyles = $helper_render_engine->renderCSS($styles);
1511
  $tags['#< *'.$tag.'((?:(?!style).)*)>#Ui'] = '<'.$tag.' style="'.$inlineStyles.'"$1>';
1512
  unset($tags[$tag]);
1513
  }
index.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: MailPoet Newsletters
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters. Import and manage your lists. Add subscription forms in widgets, articles and pages. MailPoet (formerly Wysija) is a freemium plugin updated regularly with new features.
6
- Version: 2.6.12
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
3
  Plugin Name: MailPoet Newsletters
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters. Import and manage your lists. Add subscription forms in widgets, articles and pages. MailPoet (formerly Wysija) is a freemium plugin updated regularly with new features.
6
+ Version: 2.6.13
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
languages/wysija-newsletters-ach.mo CHANGED
Binary file
languages/wysija-newsletters-af.mo CHANGED
Binary file
languages/wysija-newsletters-ar.mo CHANGED
Binary file
languages/wysija-newsletters-bg_BG.mo CHANGED
Binary file
languages/wysija-newsletters-bn_BD.mo CHANGED
Binary file
languages/wysija-newsletters-bs_BA.mo CHANGED
Binary file
languages/wysija-newsletters-ca.mo CHANGED
Binary file
languages/wysija-newsletters-ca@valencia.mo CHANGED
Binary file
languages/wysija-newsletters-ca_ES.mo CHANGED
Binary file
languages/wysija-newsletters-cs_CZ.mo CHANGED
Binary file
languages/wysija-newsletters-da_DK.mo CHANGED
Binary file
languages/wysija-newsletters-de_AT.mo CHANGED
Binary file
languages/wysija-newsletters-de_DE.mo CHANGED
Binary file
languages/wysija-newsletters-el.mo CHANGED
Binary file
languages/wysija-newsletters-en_GB.mo CHANGED
Binary file
languages/wysija-newsletters-es.mo CHANGED
Binary file
languages/wysija-newsletters-es_419.mo CHANGED
Binary file
languages/wysija-newsletters-es_AR.mo CHANGED
Binary file
languages/wysija-newsletters-es_ES.mo CHANGED
Binary file
languages/wysija-newsletters-et.mo CHANGED
Binary file
languages/wysija-newsletters-eu.mo CHANGED
Binary file
languages/wysija-newsletters-eu_ES.mo CHANGED
Binary file
languages/wysija-newsletters-fa.mo CHANGED
Binary file
languages/wysija-newsletters-fa_IR.mo CHANGED
Binary file
languages/wysija-newsletters-fi.mo CHANGED
Binary file
languages/wysija-newsletters-fr_FR.mo CHANGED
Binary file
languages/wysija-newsletters-ga.mo CHANGED
Binary file
languages/wysija-newsletters-gl_ES.mo CHANGED
Binary file
languages/wysija-newsletters-he_IL.mo CHANGED
Binary file
languages/wysija-newsletters-hi_IN.mo CHANGED
Binary file
languages/wysija-newsletters-hr_HR.mo CHANGED
Binary file
languages/wysija-newsletters-hu_HU.mo CHANGED
Binary file
languages/wysija-newsletters-hy_AM.mo CHANGED
Binary file
languages/wysija-newsletters-id.mo CHANGED
Binary file
languages/wysija-newsletters-it_IT.mo CHANGED
Binary file
languages/wysija-newsletters-ja.mo CHANGED
Binary file
languages/wysija-newsletters-ko_KR.mo CHANGED
Binary file
languages/wysija-newsletters-lt_LT.mo CHANGED
Binary file
languages/wysija-newsletters-lv.mo CHANGED
Binary file
languages/wysija-newsletters-lv_LV.mo CHANGED
Binary file
languages/wysija-newsletters-mk_MK.mo CHANGED
Binary file
languages/wysija-newsletters-my_MM.mo CHANGED
Binary file
languages/wysija-newsletters-nb_NO.mo CHANGED
Binary file
languages/wysija-newsletters-nl_BE.mo CHANGED
Binary file
languages/wysija-newsletters-nl_NL.mo CHANGED
Binary file
languages/wysija-newsletters-oc.mo CHANGED
Binary file
languages/wysija-newsletters-pl_PL.mo CHANGED
Binary file
languages/wysija-newsletters-pt_BR.mo CHANGED
Binary file
languages/wysija-newsletters-pt_PT.mo CHANGED
Binary file
languages/wysija-newsletters-ro_RO.mo CHANGED
Binary file
languages/wysija-newsletters-ru_RU.mo CHANGED
Binary file
languages/wysija-newsletters-sk_SK.mo CHANGED
Binary file
languages/wysija-newsletters-sl_SI.mo CHANGED
Binary file
languages/wysija-newsletters-sq.mo CHANGED
Binary file
languages/wysija-newsletters-sr@latin.mo CHANGED
Binary file
languages/wysija-newsletters-sr_RS.mo CHANGED
Binary file
languages/wysija-newsletters-sr_RS@latin.mo CHANGED
Binary file
languages/wysija-newsletters-sv_SE.mo CHANGED
Binary file
languages/wysija-newsletters-tr_TR.mo CHANGED
Binary file
languages/wysija-newsletters-uk.mo CHANGED
Binary file
languages/wysija-newsletters-ur_PK.mo CHANGED
Binary file
languages/wysija-newsletters-vi.mo CHANGED
Binary file
languages/wysija-newsletters-zh_CN.mo CHANGED
Binary file
languages/wysija-newsletters-zh_HK.mo CHANGED
Binary file
languages/wysija-newsletters-zh_TW.mo CHANGED
Binary file
models/user.php CHANGED
@@ -27,6 +27,16 @@ class WYSIJA_model_user extends WYSIJA_model{
27
  $this->WYSIJA_model();
28
  }
29
 
 
 
 
 
 
 
 
 
 
 
30
  function beforeInsert(){
31
  // set the activation key
32
  $model_user = WYSIJA::get( 'user' , 'model' );
@@ -580,7 +590,7 @@ class WYSIJA_model_user extends WYSIJA_model{
580
  if($return_query) return $query;
581
 
582
  if( empty($_REQUEST['orderby']) || !is_string($_REQUEST['orderby']) || preg_match('|[^a-z0-9#_.-]|i',$_REQUEST['orderby']) !== 0 ){
583
- $order_by = '';
584
  }else{
585
 
586
  if(!in_array(strtoupper($_REQUEST['ordert']),array('DESC','ASC'))){
27
  $this->WYSIJA_model();
28
  }
29
 
30
+ function refresh_columns(){
31
+ $WJ_Field = new WJ_Field();
32
+ $custom_fields = $WJ_Field->get_all();
33
+ if(!empty($custom_fields)){
34
+ foreach($custom_fields as $row){
35
+ $this->columns['cf_'.$row->id] = array();
36
+ }
37
+ }
38
+ }
39
+
40
  function beforeInsert(){
41
  // set the activation key
42
  $model_user = WYSIJA::get( 'user' , 'model' );
590
  if($return_query) return $query;
591
 
592
  if( empty($_REQUEST['orderby']) || !is_string($_REQUEST['orderby']) || preg_match('|[^a-z0-9#_.-]|i',$_REQUEST['orderby']) !== 0 ){
593
+ $order_by = ' ORDER BY A.user_id DESC';
594
  }else{
595
 
596
  if(!in_array(strtoupper($_REQUEST['ordert']),array('DESC','ASC'))){
models/user_list.php CHANGED
@@ -84,7 +84,6 @@ class WYSIJA_model_user_list extends WYSIJA_model{
84
  AND ul.`user_id` IN ('.implode(', ', $user_ids).')
85
  WHERE
86
  l.`is_enabled` = 1
87
- AND l.`namekey` != "users"
88
  GROUP BY
89
  `user_id`';
90
  $result = $this->get_results($query);
84
  AND ul.`user_id` IN ('.implode(', ', $user_ids).')
85
  WHERE
86
  l.`is_enabled` = 1
 
87
  GROUP BY
88
  `user_id`';
89
  $result = $this->get_results($query);
readme.txt CHANGED
@@ -1,9 +1,9 @@
1
  === MailPoet Newsletters ===
2
  Contributors: wysija, kgjerstad, benheu, JoN1oP, badshark
3
- Tags: newsletter, newsletters, wysija, newsletter signup, newsletter widget, subscribers, post notification, email subscription, email alerts, automatic newsletter, auto newsletter, autoresponder, follow up, email, marketing, emailing, subscription, mail poet, mailpoet
4
  Requires at least: 3.3
5
  Tested up to: 4.0
6
- Stable tag: 2.6.12
7
  Send newsletters, post notifications or autoresponders from WordPress easily, and beautifully.
8
 
9
  == Description ==
@@ -133,6 +133,16 @@ Our [support site](http://support.mailpoet.com/) has plenty of articles and a ti
133
 
134
  == Changelog ==
135
 
 
 
 
 
 
 
 
 
 
 
136
  = 2.6.12 - 2014-10-16 =
137
  * Improved security thanks to Dominik Schilling, [Ryan Satterfield](http://planetzuda.com) and [Logical Trust](https://logicaltrust.net/en/)
138
  * Improved performance issue
1
  === MailPoet Newsletters ===
2
  Contributors: wysija, kgjerstad, benheu, JoN1oP, badshark
3
+ Tags: newsletter, newsletters, newsletter signup, subscribers, post notification, email subscription, email alerts, auto newsletter, autoresponder, follow up, email, marketing, emailing, subscription
4
  Requires at least: 3.3
5
  Tested up to: 4.0
6
+ Stable tag: 2.6.13
7
  Send newsletters, post notifications or autoresponders from WordPress easily, and beautifully.
8
 
9
  == Description ==
133
 
134
  == Changelog ==
135
 
136
+ = 2.6.13 - 2014-10-28 =
137
+ * Improved security a lot since July 2014, please update.
138
+ * Fixed a conflict with the plugin [Magic Action Box](https://wordpress.org/plugins/magic-action-box/)
139
+ * Fixed blank export file when exporting subscribers with custom fields
140
+ * Fixed the default subscribers ordering in the backend, we now display the most recent first
141
+ * Fixed the bug on Bold and Italic commands in our newsletter editor
142
+ * Fixed an issue on the new bulk resend confirmation email feature
143
+ * Fixed bounce management issue (Premium only), counting until 3 when a mailbox is full
144
+ * Fixing 1 bug a day, stopped eating our veggies
145
+
146
  = 2.6.12 - 2014-10-16 =
147
  * Improved security thanks to Dominik Schilling, [Ryan Satterfield](http://planetzuda.com) and [Logical Trust](https://logicaltrust.net/en/)
148
  * Improved performance issue
tools/styles/css-editor.html CHANGED
@@ -22,7 +22,7 @@
22
  padding:0 !important;
23
  word-wrap: break-word;
24
  }
25
- {#text_container}, {#text_container} p {
26
  margin:1em 0 1em 0 !important;
27
  }
28
  #tinymce ol, #tinymce ul,
22
  padding:0 !important;
23
  word-wrap: break-word;
24
  }
25
+ {#text_container} p {
26
  margin:1em 0 1em 0 !important;
27
  }
28
  #tinymce ol, #tinymce ul,
views/back/campaigns.php CHANGED
@@ -3073,6 +3073,7 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
3073
  <p>View <a target="_blank" href="http://www.mailpoet.com/?wysija-page=1&controller=email&action=view&email_id=64&wysijap=subscriptions-2">an example</a> of a newsletter we sent previously.</p>
3074
  </div>' .
3075
  '<div class="mpoet-update-subscribe-right">' .
 
3076
  '<iframe width="380px" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="position: static; top: 0pt; margin: 0px; border-style: none; height: 125px; left: 0pt; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="Subscription Wysija"></iframe>
3077
  </div>
3078
  <div style="clear:both;"></div>
3073
  <p>View <a target="_blank" href="http://www.mailpoet.com/?wysija-page=1&controller=email&action=view&email_id=64&wysijap=subscriptions-2">an example</a> of a newsletter we sent previously.</p>
3074
  </div>' .
3075
  '<div class="mpoet-update-subscribe-right">' .
3076
+
3077
  '<iframe width="380px" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="position: static; top: 0pt; margin: 0px; border-style: none; height: 125px; left: 0pt; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="Subscription Wysija"></iframe>
3078
  </div>
3079
  <div style="clear:both;"></div>
views/front.php CHANGED
@@ -5,7 +5,6 @@ class WYSIJA_view_front extends WYSIJA_view{
5
  function WYSIJA_view_front(){
6
 
7
  }
8
-
9
  /**
10
  * deprecated, but kept for conflict with plugin Magic action box
11
  * until it's fixed.
5
  function WYSIJA_view_front(){
6
 
7
  }
 
8
  /**
9
  * deprecated, but kept for conflict with plugin Magic action box
10
  * until it's fixed.