WordPress.org
Get WordPress

Plugin Directory

Changeset 1182478


Ignore:
Timestamp:
06/17/2015 10:21:29 AM (11 years ago)
Author:
FreshMail.com
Message:

v2.0.1 - FIX with some minor bugs

Location:
freshmail-newsletter/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • freshmail-newsletter/trunk/CHANGELOG.md

    r1181908 r1182478  
    11### Changelog
     2
     3- 2.0.1 - 2015-06-17
     4    * Fix: Displaying shortcode in custom place of content
     5    * Fix: Freshmail version compare
     6    * Fix: Database converting to freshmail 2.x standard
    27
    38- 2.0 - 2015-06-15

  • freshmail-newsletter/trunk/languages/en_EN.po

    r1181908 r1182478  
    22msgstr ""
    33"Project-Id-Version: wp_freshmail\n"
    4 "POT-Creation-Date: 2015-06-16 16:08+0100\n"
    5 "PO-Revision-Date: 2015-06-16 16:08+0100\n"
     4"POT-Creation-Date: 2015-06-17 12:12+0100\n"
     5"PO-Revision-Date: 2015-06-17 12:12+0100\n"
    66"Last-Translator: \n"
    77"Language-Team: \n"
    … …  
    4242msgstr ""
    4343
    44 #: ../src/Plugin/Newsletter/Freshmail.php:506
     44#: ../src/Plugin/Newsletter/Freshmail.php:509
    4545#: ../templates/form_messages.php:10
    4646msgid "Subscribe to our newsletter"
    4747msgstr ""
    4848
    49 #: ../src/Plugin/Newsletter/Freshmail.php:507
     49#: ../src/Plugin/Newsletter/Freshmail.php:510
    5050#: ../templates/form_messages.php:24
    5151msgid "Get updates direct to your inbox."
    5252msgstr ""
    5353
    54 #: ../src/Plugin/Newsletter/Freshmail.php:508
     54#: ../src/Plugin/Newsletter/Freshmail.php:511
    5555#: ../templates/form_messages.php:29
    5656msgid "Send me your newsletter (you can unsubscribe at any time)."
    5757msgstr ""
    5858
    59 #: ../src/Plugin/Newsletter/Freshmail.php:509
     59#: ../src/Plugin/Newsletter/Freshmail.php:512
    6060#: ../templates/form_messages.php:34
    6161msgid "Sign me up!"
    6262msgstr ""
    6363
    64 #: ../src/Plugin/Newsletter/Freshmail.php:510
     64#: ../src/Plugin/Newsletter/Freshmail.php:513
    6565#: ../templates/form_messages.php:43
    6666msgid "Your sign up request was successful! Please check your email inbox."
    6767msgstr ""
    6868
    69 #: ../src/Plugin/Newsletter/Freshmail.php:511
     69#: ../src/Plugin/Newsletter/Freshmail.php:514
    7070#: ../templates/form_messages.php:48
    7171msgid "Oops. Something went wrong. Please try again later."
    7272msgstr ""
    7373
    74 #: ../src/Plugin/Newsletter/Freshmail.php:512
     74#: ../src/Plugin/Newsletter/Freshmail.php:515
    7575#: ../templates/form_messages.php:54
    7676msgid "Given email address is already subscribed, thank you!"
    7777msgstr ""
    7878
    79 #: ../src/Plugin/Newsletter/Freshmail.php:513
     79#: ../src/Plugin/Newsletter/Freshmail.php:516
    8080#: ../templates/form_messages.php:60
    8181msgid "Please provide a valid email address"
    8282msgstr ""
    8383
    84 #: ../src/Plugin/Newsletter/Freshmail.php:514
     84#: ../src/Plugin/Newsletter/Freshmail.php:517
    8585#: ../templates/form_messages.php:65
    8686msgid "Please fill all the required fields"
    8787msgstr ""
    8888
    89 #: ../src/Plugin/Newsletter/Freshmail.php:540
     89#: ../src/Plugin/Newsletter/Freshmail.php:543
    9090msgid "The Sign Up Form has been updated!"
    9191msgstr ""
    9292
    93 #: ../src/Plugin/Newsletter/Freshmail.php:559
     93#: ../src/Plugin/Newsletter/Freshmail.php:562
    9494msgid "The Sign Up Form has been added!"
    9595msgstr ""
    9696
    97 #: ../src/Plugin/Newsletter/Freshmail.php:559
     97#: ../src/Plugin/Newsletter/Freshmail.php:562
    9898msgid "Show"
    9999msgstr ""
    100100
    101 #: ../src/Plugin/Newsletter/Freshmail.php:681
     101#: ../src/Plugin/Newsletter/Freshmail.php:684
    102102msgid "There are no added an email via the sign up form!"
    103103msgstr ""
    104104
    105 #: ../src/Plugin/Newsletter/Freshmail.php:729
    106 #: ../src/Plugin/Newsletter/Freshmail.php:762
    107 #: ../src/Plugin/Newsletter/Freshmail.php:763
     105#: ../src/Plugin/Newsletter/Freshmail.php:732
    108106#: ../src/Plugin/Newsletter/Freshmail.php:765
    109 #: ../src/Plugin/Newsletter/Freshmail.php:787
     107#: ../src/Plugin/Newsletter/Freshmail.php:766
     108#: ../src/Plugin/Newsletter/Freshmail.php:768
     109#: ../src/Plugin/Newsletter/Freshmail.php:790
    110110#: ../templates/admin_reports.php:100 ../templates/admin_reports.php:101
    111111msgid "Total subscriptions"
    112112msgstr ""
    113113
    114 #: ../src/Plugin/Newsletter/Freshmail.php:730
    115 #: ../src/Plugin/Newsletter/Freshmail.php:749
    116 #: ../src/Plugin/Newsletter/Freshmail.php:750
     114#: ../src/Plugin/Newsletter/Freshmail.php:733
    117115#: ../src/Plugin/Newsletter/Freshmail.php:752
    118 #: ../src/Plugin/Newsletter/Freshmail.php:788
     116#: ../src/Plugin/Newsletter/Freshmail.php:753
     117#: ../src/Plugin/Newsletter/Freshmail.php:755
     118#: ../src/Plugin/Newsletter/Freshmail.php:791
    119119#: ../templates/admin_reports.php:109 ../templates/admin_reports.php:110
    120120msgid "Using Form"
    121121msgstr ""
    122122
    123 #: ../src/Plugin/Newsletter/Freshmail.php:731
    124 #: ../src/Plugin/Newsletter/Freshmail.php:755
    125 #: ../src/Plugin/Newsletter/Freshmail.php:756
     123#: ../src/Plugin/Newsletter/Freshmail.php:734
    126124#: ../src/Plugin/Newsletter/Freshmail.php:758
    127 #: ../src/Plugin/Newsletter/Freshmail.php:789
     125#: ../src/Plugin/Newsletter/Freshmail.php:759
     126#: ../src/Plugin/Newsletter/Freshmail.php:761
     127#: ../src/Plugin/Newsletter/Freshmail.php:792
    128128#: ../templates/admin_reports.php:119 ../templates/admin_reports.php:120
    129129msgid "Using Checkbox"
    130130msgstr ""
    131131
    132 #: ../src/Plugin/Newsletter/Freshmail.php:805
    133 #: ../src/Plugin/Newsletter/Freshmail.php:869
     132#: ../src/Plugin/Newsletter/Freshmail.php:808
     133#: ../src/Plugin/Newsletter/Freshmail.php:872
    134134#: ../templates/admin_reports.php:88
    135135msgid "Sign-Up Form"
    136136msgstr ""
    137137
    138 #: ../src/Plugin/Newsletter/Freshmail.php:913
     138#: ../src/Plugin/Newsletter/Freshmail.php:916
    139139msgid "Deleted"
    140140msgstr ""
    141141
    142 #: ../src/Plugin/Newsletter/Freshmail.php:927
     142#: ../src/Plugin/Newsletter/Freshmail.php:930
    143143msgid "The Sign Up Checkboxes has been updated!"
    144144msgstr ""
    145145
    146 #: ../src/Plugin/Newsletter/Freshmail.php:965
     146#: ../src/Plugin/Newsletter/Freshmail.php:968
    147147#: ../templates/admin_checkboxes.php:40
    148148msgid "Comment Form"
    149149msgstr ""
    150150
    151 #: ../src/Plugin/Newsletter/Freshmail.php:987
     151#: ../src/Plugin/Newsletter/Freshmail.php:990
    152152#: ../templates/admin_checkboxes.php:49
    153153msgid "Registration Form"
    154154msgstr ""
    155155
    156 #: ../src/Plugin/Newsletter/Freshmail.php:1004
     156#: ../src/Plugin/Newsletter/Freshmail.php:1007
    157157#: ../templates/admin_checkboxes.php:59
    158158msgid "WooCommerce Checkout"
    159159msgstr ""
    160160
    161 #: ../src/Plugin/Newsletter/Freshmail.php:1021
     161#: ../src/Plugin/Newsletter/Freshmail.php:1024
    162162msgid "Easy Digital Download Checkout "
    163163msgstr ""
    164164
    165 #: ../src/Plugin/Newsletter/Freshmail.php:1063
     165#: ../src/Plugin/Newsletter/Freshmail.php:1066
    166166msgid "bbPress new topic"
    167167msgstr ""
    168168
    169 #: ../src/Plugin/Newsletter/Freshmail.php:1082
     169#: ../src/Plugin/Newsletter/Freshmail.php:1085
    170170msgid "bbPress new reply"
    171171msgstr ""
    172172
    173 #: ../src/Plugin/Newsletter/Freshmail.php:1119
    174 #: ../src/Plugin/Newsletter/Freshmail.php:1135
     173#: ../src/Plugin/Newsletter/Freshmail.php:1122
     174#: ../src/Plugin/Newsletter/Freshmail.php:1138
    175175msgid "Multisite Form"
    176176msgstr ""
    177177
    178 #: ../src/Plugin/Newsletter/Freshmail.php:1164
     178#: ../src/Plugin/Newsletter/Freshmail.php:1167
    179179#: ../templates/admin_checkboxes.php:99
    180180msgid "BuddyPress registration"
    181181msgstr ""
    182182
    183 #: ../src/Plugin/Newsletter/Freshmail.php:1188
     183#: ../src/Plugin/Newsletter/Freshmail.php:1191
    184184#: ../templates/admin_checkboxes.php:123 ../templates/form_appearance.php:68
    185185#: ../templates/form_appearance.php:109 ../templates/form_appearance.php:255
    … …  
    189189msgstr ""
    190190
    191 #: ../src/Plugin/Newsletter/Freshmail.php:1188
     191#: ../src/Plugin/Newsletter/Freshmail.php:1191
    192192#: ../templates/admin_checkboxes.php:126 ../templates/form_appearance.php:69
    193193#: ../templates/form_appearance.php:110 ../templates/form_appearance.php:256
    … …  
    197197msgstr ""
    198198
    199 #: ../src/Plugin/Newsletter/Freshmail.php:1190
     199#: ../src/Plugin/Newsletter/Freshmail.php:1193
    200200#: ../templates/admin_checkboxes.php:110
    201201msgid "Contact form 7"
    … …  
    10621062msgstr ""
    10631063
    1064 #: ../wp-freshmail.php:115
     1064#: ../wp-freshmail.php:117
    10651065msgid "Black_and_white"
    10661066msgstr ""
    10671067
    1068 #: ../wp-freshmail.php:188
     1068#: ../wp-freshmail.php:190
    10691069msgid "Yellow"
    10701070msgstr ""
    10711071
    1072 #: ../wp-freshmail.php:261
     1072#: ../wp-freshmail.php:263
    10731073msgid "Grey"
    10741074msgstr ""
    10751075
    1076 #: ../wp-freshmail.php:334
     1076#: ../wp-freshmail.php:336
    10771077msgid "Blue"
    10781078msgstr ""
    10791079
    1080 #: ../wp-freshmail.php:407
     1080#: ../wp-freshmail.php:409
    10811081msgid "White_and_Red"
    10821082msgstr ""
    10831083
    1084 #: ../wp-freshmail.php:480
     1084#: ../wp-freshmail.php:482
    10851085msgid "Green"
    10861086msgstr ""
    10871087
    1088 #: ../wp-freshmail.php:553
     1088#: ../wp-freshmail.php:555
    10891089msgid "Black"
    10901090msgstr ""
    10911091
    1092 #: ../wp-freshmail.php:626
     1092#: ../wp-freshmail.php:628
    10931093msgid "green_only_placeholders"
    10941094msgstr ""
    10951095
    1096 #: ../wp-freshmail.php:699
     1096#: ../wp-freshmail.php:701
    10971097msgid "black_only_placeholders"
    10981098msgstr ""
    10991099
    1100 #: ../wp-freshmail.php:772
     1100#: ../wp-freshmail.php:774
    11011101msgid "blue_only_placeholders"
    11021102msgstr ""

  • freshmail-newsletter/trunk/src/Plugin/Newsletter/Freshmail.php

    r1181908 r1182478  
    372372    public function shortcode($fmFormId)
    373373    {
     374        ob_start();
    374375        global $wpdb;
    375376
    … …  
    396397        $errorSuccess = $freshmailForm['appearance']['error_success'];
    397398        require(WP_FRESHMAIL_DIR.'/templates/shortcode.php');
     399
     400        return ob_get_clean();
    398401    }
    399402

  • freshmail-newsletter/trunk/wp-freshmail.php

    r1181908 r1182478  
    44 * Plugin URI: http://freshmail.com/plugin/wordpress-newsletter/
    55 * Description: FreshMail is an email marketing tool for creating and sending amazing newsletters. Our intuitive system leads users from campaign planning and creation to final reports. A free account lets you send up to 2000 messages to a maximum of 500 recipients each month.
    6  * Version: 2.0
     6 * Version: 2.0.1
    77 * Author: Borbis Media
    88 * Author URI: http://www.borbis.com
    … …  
    2121// Define plugin version for upgrade
    2222if (!defined('WP_FRESHMAIL_VERSION')) {
    23     define('WP_FRESHMAIL_VERSION', '2.0');
     23    define('WP_FRESHMAIL_VERSION', '2.0.1');
    2424}
    2525
    … …  
    3434
    3535        $currentVersion = get_option('WP_FRESHMAIL_VERSION', 0);
    36         if ($currentVersion < WP_FRESHMAIL_VERSION) {
     36        if (version_compare($currentVersion, WP_FRESHMAIL_VERSION, '<')) {
    3737
    3838            global $wpdb;
    … …  
    5858            dbDelta($sql);
    5959
    60 
    61             // check if old table exist
     60            // check if old table fm_form exist
    6261            $fm_forms = $wpdb->get_row('SELECT table_name FROM information_schema.tables WHERE table_name LIKE "'.$wpdb->prefix.'fm_forms"');
    6362            if (!empty($fm_forms)) {
    … …  
    8180                }
    8281            }
    83 
    84             $stats = $wpdb->get_row('SELECT table_name FROM information_schema.tables WHERE table_name LIKE "'.$wpdb->prefix.'fm_forms"');
     82            $wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'fm_forms');
     83
     84            // check if old table fm_mails exist
     85            $stats = $wpdb->get_row('SELECT table_name FROM information_schema.tables WHERE table_name LIKE "'.$wpdb->prefix.'fm_mails"');
    8586            if (!empty($stats)) {
    86                 $data = $wpdb->get_results('SELECT * FROM '.$wpdb->prefix.'freshmail_stats', ARRAY_A);
     87                $data = $wpdb->get_results('SELECT * FROM '.$wpdb->prefix.'fm_mails', ARRAY_A);
    8788
    8889                if (!empty($data)) {
    … …  
    107108                }
    108109            }
     110            $wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'fm_mails');
    109111
    110112            $oldCustomThemes = get_option('freshmail_custom_theme');
Note: See TracChangeset for help on using the changeset viewer.