MailPoet Newsletters (Previous) - Version 2.8.1

Version Description

  • 2017-11-28 =
  • Added poll and discounts
  • Fixed editor sidebar missing if plugins enqueue the mediaelement script on WP 4.9
Download this release

Release Info

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

Code changes from version 2.8 to 2.8.1

Files changed (7) hide show
  1. controllers/back/campaigns.php +11 -30
  2. core/base.php +1 -1
  3. helpers/back.php +2 -2
  4. helpers/conflicts.php +5 -5
  5. index.php +1 -1
  6. readme.txt +5 -1
  7. views/back/campaigns.php +24 -40
controllers/back/campaigns.php CHANGED
@@ -116,41 +116,22 @@ class WYSIJA_control_back_campaigns extends WYSIJA_control_back {
116
  }
117
 
118
  $this->data['sections'][] = array(
119
- 'title' => __("We're changing. So should you.", WYSIJA),
120
  'format' => 'title-content',
121
  'paragraphs' => array('
122
- <iframe src="https://player.vimeo.com/video/223581490" width="640" height="360" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
123
  <ul style="list-style: disc inside none">
124
- <li>'.$this->viewObj->replace_link_shortcode(__("[link]Read the FAQ[/link] on what's going to happen to this current version of MailPoet (version 2)", WYSIJA), 'http://www.mailpoet.com/faq-mailpoet-version-2/').'</li>
125
- <li>'.__('MailPoet version 3 is completely rewritten', WYSIJA).'</li>
126
- <li>'.__('New email designer', WYSIJA).'</li>
127
- <li>'.__('Responsive templates', WYSIJA).'</li>
128
- <li>'.__('Fast user interface', WYSIJA).'</li>
129
- <li>'.__('Same easy configuration', WYSIJA).'</li>
130
- <li>'.__('Weekly releases', WYSIJA).'</li>
131
- <li>'.__('Version 2 and 3 can live side by side', WYSIJA).'</li>
132
- <li><a href="http://beta.docs.mailpoet.com/article/189-comparison-of-mailpoet-2-and-3?utm_source=mp2&amp;utm_medium=welcomeupdate&amp;utm_campaign=comparison">'.__('Comparison table of both versions', WYSIJA).'</a></li>
133
- <li>'.$this->viewObj->replace_link_shortcode(__('Try [link]the online demo[/link]', WYSIJA), 'http://demo3.mailpoet.com/launch/?utm_source=mp2&amp;utm_medium=updatewelcome&amp;utm_campaign=demo3').'</li>
134
- <li>'.__('Multisite works, but not officially supported. Please test MailPoet 3 on a staging server', WYSIJA).'</li>
135
- <li>'.__('Right-to-left languages works, but can be improved', WYSIJA).'</li>
136
- <li>'.
137
- $this->viewObj->replace_link_shortcode(
138
- $this->viewObj->replace_link_shortcode(
139
- __('Get in touch in the [link]forums[/link] for further help. Customers can reach via our [link]support page[/link]', WYSIJA),
140
- 'https://wordpress.org/support/plugin/wysija-newsletters'
141
- ),
142
- 'https://www.mailpoet.com/support/'
143
- ).'</li>
144
- </ul>
145
- <br>
146
- <h3 style="font-size: 25px; color: #626262; font-weight: 600;"><strong>'.__('Comes with a 1-click migration tool:', WYSIJA).'</strong></h3>
147
- <ul style="list-style: disc inside none">
148
- <li>'.__('Your subscribers, lists, forms and settings will be migrated', WYSIJA).'</li>
149
- <li>'.__('Automatic emails will not be migrated', WYSIJA).'</li>
150
- <li>'.__('Archive of sent emails will not be migrated', WYSIJA).'</li>
151
- <li>'.__('Your statistics will not be migrated', WYSIJA).'</li>
152
  </ul>
 
153
  <a class="button-primary" href="plugin-install.php?s=mailpoet&tab=search&type=author">'.__('Download MailPoet 3 now', WYSIJA).'</a>
 
 
 
 
 
 
154
  ')
155
  );
156
 
116
  }
117
 
118
  $this->data['sections'][] = array(
 
119
  'format' => 'title-content',
120
  'paragraphs' => array('
 
121
  <ul style="list-style: disc inside none">
122
+ <li><a href="http://beta.docs.mailpoet.com/article/234-video-overview?utm_source=mp2&utm_campaign=whatsnew">'.__("View the 2-minute video", WYSIJA).'</a></li>
123
+ <li><a href="https://www.mailpoet.com/faq-mailpoet-version-2/?utm_source=mp2&utm_campaign=whatsnew">'.__("Read the FAQ", WYSIJA).'</a></li>
124
+ <li><a href="http://beta.docs.mailpoet.com/article/189-comparison-of-mailpoet-2-and-3?utm_source=mp2&utm_campaign=whatsnew">'.__('Comparison table of both versions', WYSIJA).'</a></li>
125
+ <li><a href="http://demo.mailpoet.com?utm_source=mp2&utm_campaign=whatsnew">'.__('Try the online demo', WYSIJA).'</li>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
126
  </ul>
127
+ <br/>
128
  <a class="button-primary" href="plugin-install.php?s=mailpoet&tab=search&type=author">'.__('Download MailPoet 3 now', WYSIJA).'</a>
129
+
130
+ <!-- poll -->
131
+ <div><br/><br/></div>
132
+ <style type="text/css">.pds-box { margin: 0 !important; }</style>
133
+ <script type="text/javascript" charset="utf-8" src="https://secure.polldaddy.com/p/9882029.js"></script>
134
+ <noscript><a href="https://polldaddy.com/poll/9882029/">I\'m not switching to the new MailPoet 3 because...</a></noscript>
135
  ')
136
  );
137
 
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.8';
23
 
24
  function __construct(){}
25
 
19
  * Static variable holding core MailPoet's version
20
  * @var array
21
  */
22
+ static $version = '2.8.1';
23
 
24
  function __construct(){}
25
 
helpers/back.php CHANGED
@@ -349,10 +349,10 @@ class WYSIJA_help_back extends WYSIJA_help{
349
  $truelinkhelp = '<p>'.str_replace($finds,$replace,$linkcontent).'</p>';
350
  $truelinkhelp .= '<p>'.__('MailPoet Version: ',WYSIJA).'<strong>'.WYSIJA::get_version().'</strong></p>';
351
 
352
- $red_dot = is_plugin_active('mailpoet/mailpoet.php') ? '' : ' <span class="update-plugins"><span class="update-count">1</span></span>';
353
 
354
  $this->menus=array(
355
- 'campaigns'=>array('title'=>'MailPoet'. $red_dot),
356
  'subscribers'=>array('title'=>__('Subscribers',WYSIJA)), // if the key "subscribers" is changed, please change in the filter "wysija_menus" as well.
357
  'config'=>array('title'=>__('Settings',WYSIJA)),
358
  'premium'=>array('title'=>__('Premium',WYSIJA)),
349
  $truelinkhelp = '<p>'.str_replace($finds,$replace,$linkcontent).'</p>';
350
  $truelinkhelp .= '<p>'.__('MailPoet Version: ',WYSIJA).'<strong>'.WYSIJA::get_version().'</strong></p>';
351
 
352
+ $red_dot = is_plugin_active('mailpoet/mailpoet.php') ? '2' : '<span class="update-plugins"><span class="update-count">1</span></span>';
353
 
354
  $this->menus=array(
355
+ 'campaigns'=>array('title'=>'MailPoet '. $red_dot),
356
  'subscribers'=>array('title'=>__('Subscribers',WYSIJA)), // if the key "subscribers" is changed, please change in the filter "wysija_menus" as well.
357
  'config'=>array('title'=>__('Settings',WYSIJA)),
358
  'premium'=>array('title'=>__('Premium',WYSIJA)),
helpers/conflicts.php CHANGED
@@ -106,12 +106,12 @@ class WYSIJA_help_conflicts extends WYSIJA_object{
106
  }
107
 
108
  function resolveScriptConflicts() {
109
- // WP 4.9 mediaelement scripts conflicts with the MP2 editor
110
  $dequeue_scripts = function () {
111
- wp_dequeue_script('media-editor');
112
- wp_dequeue_script('media-audiovideo');
113
- wp_dequeue_script('mce-view');
114
  };
115
- add_action('wp_enqueue_media', $dequeue_scripts, PHP_INT_MAX);
 
 
116
  }
117
  }
106
  }
107
 
108
  function resolveScriptConflicts() {
109
+ // WP 4.9 mediaelement script conflicts with the MP2 editor
110
  $dequeue_scripts = function () {
111
+ wp_deregister_script('mediaelement');
 
 
112
  };
113
+ add_action('wp_print_scripts', $dequeue_scripts, PHP_INT_MAX);
114
+ add_action('admin_print_footer_scripts', $dequeue_scripts, PHP_INT_MAX);
115
+ add_action('admin_footer', $dequeue_scripts, PHP_INT_MAX);
116
  }
117
  }
index.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: MailPoet 2
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters or automated emails. Capture subscribers with a widget. Import and manage your lists. This version is being replaced by MailPoet 3. Support offered to Premium customers only. Updates are limited to security issues.
6
- Version: 2.8
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
3
  Plugin Name: MailPoet 2
4
  Plugin URI: http://www.mailpoet.com/
5
  Description: Create and send newsletters or automated emails. Capture subscribers with a widget. Import and manage your lists. This version is being replaced by MailPoet 3. Support offered to Premium customers only. Updates are limited to security issues.
6
+ Version: 2.8.1
7
  Author: MailPoet
8
  Author URI: http://www.mailpoet.com/
9
  License: GPLv2 or later
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: wysija
3
  Tags: newsletter, email, welcome email, post notification, autoresponder, signup, subscription, SMTP
4
  Requires at least: 3.5
5
  Tested up to: 4.9
6
- Stable tag: 2.8
7
  Send newsletters post notifications or autoresponders from WordPress easily, and beautifully. Start to capture subscribers with our widget now.
8
 
9
  == Description ==
@@ -113,6 +113,10 @@ Our [support site](https://www.mailpoet.com/support) has plenty of articles and
113
 
114
  == Changelog ==
115
 
 
 
 
 
116
  = 2.8 - 2017-11-20 =
117
  * Added support for ReCaptcha to protect subscription forms from automated abuse
118
  * Fixed editor sidebar missing if a theme uses wp_enqueue_media() function on WP 4.9
3
  Tags: newsletter, email, welcome email, post notification, autoresponder, signup, subscription, SMTP
4
  Requires at least: 3.5
5
  Tested up to: 4.9
6
+ Stable tag: 2.8.1
7
  Send newsletters post notifications or autoresponders from WordPress easily, and beautifully. Start to capture subscribers with our widget now.
8
 
9
  == Description ==
113
 
114
  == Changelog ==
115
 
116
+ = 2.8.1 - 2017-11-28 =
117
+ * Added poll and discounts
118
+ * Fixed editor sidebar missing if plugins enqueue the mediaelement script on WP 4.9
119
+
120
  = 2.8 - 2017-11-20 =
121
  * Added support for ReCaptcha to protect subscription forms from automated abuse
122
  * Fixed editor sidebar missing if a theme uses wp_enqueue_media() function on WP 4.9
views/back/campaigns.php CHANGED
@@ -2655,6 +2655,13 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2655
 
2656
  <h1><?php echo __('Try the new (and much better) MailPoet now', WYSIJA); ?></h1>
2657
 
 
 
 
 
 
 
 
2658
  <div class="about-text" style="visibility:hidden"><?php echo $data['abouttext'] ?></div>
2659
  <?php
2660
  foreach ($data['sections'] as $section) {
@@ -2770,43 +2777,23 @@ class WYSIJA_view_back_campaigns extends WYSIJA_view_back {
2770
  $is_network_admin = WYSIJA::current_user_can('manage_network');
2771
 
2772
  $data['sections'][] = array(
2773
- 'title' => __("We're changing. So should you.", WYSIJA),
2774
  'format' => 'title-content',
2775
  'content' => '
2776
- <iframe src="https://player.vimeo.com/video/223581490" width="640" height="360" frameborder="0" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen=""></iframe>
2777
- <ul>
2778
- <li>'.$this->replace_link_shortcode(__("[link]Read the FAQ[/link] on what's going to happen to this current version of MailPoet (version 2)", WYSIJA), 'http://www.mailpoet.com/faq-mailpoet-version-2/').'</li>
2779
- <li>'.__('MailPoet version 3 is completely rewritten', WYSIJA).'</li>
2780
- <li>'.__('New email designer', WYSIJA).'</li>
2781
- <li>'.__('Responsive templates', WYSIJA).'</li>
2782
- <li>'.__('Fast user interface', WYSIJA).'</li>
2783
- <li>'.__('Same easy configuration', WYSIJA).'</li>
2784
- <li>'.__('Weekly releases', WYSIJA).'</li>
2785
- <li>'.__('Version 2 and 3 can live side by side', WYSIJA).'</li>
2786
- <li><a href="http://beta.docs.mailpoet.com/article/189-comparison-of-mailpoet-2-and-3?utm_source=mp2&amp;utm_medium=welcomeupdate&amp;utm_campaign=comparison">'.__('Comparison table of both versions', WYSIJA).'</a></li>
2787
- <li>'.$this->replace_link_shortcode(__('Try [link]the online demo[/link]', WYSIJA), 'http://demo3.mailpoet.com/launch/?utm_source=mp2&amp;utm_medium=updatewelcome&amp;utm_campaign=demo3').'</li>
2788
- <li>'.__('Multisite works, but not officially supported. Please test MailPoet 3 on a staging server', WYSIJA).'</li>
2789
- <li>'.__('Right-to-left languages works, but can be improved', WYSIJA).'</li>
2790
- <li>'.
2791
- $this->replace_link_shortcode(
2792
- $this->replace_link_shortcode(
2793
- __('Get in touch in the [link]forums[/link] for further help. Customers can reach via our [link]support page[/link]', WYSIJA),
2794
- 'https://wordpress.org/support/plugin/wysija-newsletters'
2795
- ),
2796
- 'https://www.mailpoet.com/support/'
2797
- ).'</li>
2798
- </ul>
2799
- <br>
2800
- <h3><strong>'.__('Comes with a 1-click migration tool:', WYSIJA).'</strong></h3>
2801
- <ul>
2802
- <li>'.__('Your subscribers, lists, forms and settings will be migrated', WYSIJA).'</li>
2803
- <li>'.__('Automatic emails will not be migrated', WYSIJA).'</li>
2804
- <li>'.__('Archive of sent emails will not be migrated', WYSIJA).'</li>
2805
- <li>'.__('Your statistics will not be migrated', WYSIJA).'</li>
2806
-
2807
-
2808
  </ul>
 
2809
  <a class="button-primary" href="plugin-install.php?s=mailpoet&tab=search&type=author">'.__('Download MailPoet 3 now', WYSIJA).'</a>
 
 
 
 
 
 
2810
  '
2811
  );
2812
 
@@ -2887,14 +2874,11 @@ $this->replace_link_shortcode(
2887
 
2888
  <h1><?php echo sprintf(__('You\'ve updated to %1$s', WYSIJA), '<span class="version">MailPoet '.WYSIJA::get_version())."</span>"; ?></h1>
2889
 
2890
- <div class="error"><p><?php
2891
  echo $this->replace_link_shortcode(
2892
- $this->replace_link_shortcode(
2893
- __('Having spam issues with MailPoet 2 subscription forms? Upgrade to [link]MailPoet 3[/link] or [link]enable Captcha[/link].', WYSIJA),
2894
- admin_url('plugin-install.php?s=mailpoet&tab=search&type=author')
2895
- ),
2896
- admin_url('admin.php?page=wysija_config#tab-advanced')
2897
- );
2898
  ?></p></div>
2899
 
2900
  <div class="about-text"><?php echo $data['abouttext'] ?></div>
2655
 
2656
  <h1><?php echo __('Try the new (and much better) MailPoet now', WYSIJA); ?></h1>
2657
 
2658
+ <div class="updated" style="display: block !important;"><p><?php
2659
+ echo $this->replace_link_shortcode(
2660
+ __('Save up to $100 on the <b>new MailPoet</b> before the end of the year. [link]See pricing[/link].', WYSIJA),
2661
+ 'https://account.mailpoet.com'
2662
+ );
2663
+ ?></p></div>
2664
+
2665
  <div class="about-text" style="visibility:hidden"><?php echo $data['abouttext'] ?></div>
2666
  <?php
2667
  foreach ($data['sections'] as $section) {
2777
  $is_network_admin = WYSIJA::current_user_can('manage_network');
2778
 
2779
  $data['sections'][] = array(
2780
+ 'title' => __("Try the new version 3 today.", WYSIJA),
2781
  'format' => 'title-content',
2782
  'content' => '
2783
+ <ul style="list-style: disc inside none">
2784
+ <li><a href="http://beta.docs.mailpoet.com/article/234-video-overview?utm_source=mp2&utm_campaign=whatsnew">'.__("View the 2-minute video", WYSIJA).'</a></li>
2785
+ <li><a href="https://www.mailpoet.com/faq-mailpoet-version-2/?utm_source=mp2&utm_campaign=whatsnew">'.__("Read the FAQ", WYSIJA).'</a></li>
2786
+ <li><a href="http://beta.docs.mailpoet.com/article/189-comparison-of-mailpoet-2-and-3?utm_source=mp2&utm_campaign=whatsnew">'.__('Comparison table of both versions', WYSIJA).'</a></li>
2787
+ <li><a href="http://demo.mailpoet.com?utm_source=mp2&utm_campaign=whatsnew">'.__('Try the online demo', WYSIJA).'</li>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2788
  </ul>
2789
+ <br/>
2790
  <a class="button-primary" href="plugin-install.php?s=mailpoet&tab=search&type=author">'.__('Download MailPoet 3 now', WYSIJA).'</a>
2791
+
2792
+ <!-- poll -->
2793
+ <div><br/><br/></div>
2794
+ <style type="text/css">.pds-box { margin: 0 !important; }</style>
2795
+ <script type="text/javascript" charset="utf-8" src="https://secure.polldaddy.com/p/9882029.js"></script>
2796
+ <noscript><a href="https://polldaddy.com/poll/9882029/">I\'m not switching to the new MailPoet 3 because...</a></noscript>
2797
  '
2798
  );
2799
 
2874
 
2875
  <h1><?php echo sprintf(__('You\'ve updated to %1$s', WYSIJA), '<span class="version">MailPoet '.WYSIJA::get_version())."</span>"; ?></h1>
2876
 
2877
+ <div class="updated"><p><?php
2878
  echo $this->replace_link_shortcode(
2879
+ __('Save up to $100 on the <b>new MailPoet</b> before the end of the year. [link]See pricing[/link].', WYSIJA),
2880
+ 'https://account.mailpoet.com'
2881
+ );
 
 
 
2882
  ?></p></div>
2883
 
2884
  <div class="about-text"><?php echo $data['abouttext'] ?></div>