WordPress.org
Get WordPress

Plugin Directory

Changeset 333265


Ignore:
Timestamp:
01/16/2011 05:38:26 PM (15 years ago)
Author:
jameslafferty
Message:

Updated to 0.6.2. Fixed merge variable issue.

Location:
mailchimp-widget/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • mailchimp-widget/trunk/lib/ns_widget_mailchimp.class.php

    r333130 r333265  
    1212    private $default_success_message = 'Thank you for joining our mailing list. Please check your email for a confirmation link.';
    1313    private $default_title = 'Sign up for our mailing list.';
    14 <<<<<<< HEAD
    15 =======
    1614    private $successful_signup = false;
    1715    private $subscribe_errors;
    18 >>>>>>> 98d063702c946fc36209b5c6093f63d5a61b2111
    1916   
    2017    private $ns_mc_plugin;
    … …  
    264261        extract($args);
    265262       
    266 <<<<<<< HEAD
    267         if ($this->hash_mailing_list_id($this->number) == $_COOKIE[$this->id_base . '-' . $this->number] || false == $this->ns_mc_plugin->get_mcapi()) {
    268 =======
    269263        if ((isset($_COOKIE[$this->id_base . '-' . $this->number]) && $this->hash_mailing_list_id($this->number) == $_COOKIE[$this->id_base . '-' . $this->number]) || false == $this->ns_mc_plugin->get_mcapi()) {
    270 >>>>>>> 98d063702c946fc36209b5c6093f63d5a61b2111
    271264           
    272265            return 0;

  • mailchimp-widget/trunk/mailchimp-widget.php

    r333130 r333265  
    55Description:
    66Author: James Lafferty
    7 Version: 0.6.1
     7Version: 0.6.2
    88Author URI: https://github.com/kalchas
    99License: GPL2

  • mailchimp-widget/trunk/readme.txt

    r333130 r333265  
    4141
    4242== Changelog ==
     43= 0.6.2 =
     44* Removed old merge data. Thank you to [huguespisapia](http://wordpress.org/support/profile/huguespisapia) for letting me know about this.
     45
    4346= 0.6.1 =
    44 *Cleaned up a few more WP_DEBUG mode errors.
     47* Cleaned up a few more WP_DEBUG mode errors.
    4548
    4649= 0.6 =
    … …  
    8083
    8184== Upgrade Notice ==
     85= 0.6.2 =
     86* Removed old merge data. Thank you to [huguespisapia](http://wordpress.org/support/profile/huguespisapia) for letting me know about this. (critical upgrade)
     87
    8288= 0.6.1 =
    8389* Corrects some additional minor errors that come up in WP_DEBUG mode.
Note: See TracChangeset for help on using the changeset viewer.