Changeset 1489834

Timestamp:

09/04/2016 08:04:55 PM (10 years ago)

Author:

jbrinley

Message:

version 1.1.2 - bugfixes

Location:

mailgun-subscriptions/trunk

Files:

• Mailgun_Subscriptions/Admin_Page.php (modified) (1 diff)
• Mailgun_Subscriptions/Plugin.php (modified) (3 diffs)
• composer.json (added)
• mailgun-subscriptions.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• uninstall.php (modified) (2 diffs)
• vendor (added)
• vendor/autoload.php (added)
• vendor/composer (added)
• vendor/composer/ClassLoader.php (added)
• vendor/composer/LICENSE (added)
• vendor/composer/autoload_classmap.php (added)
• vendor/composer/autoload_namespaces.php (added)
• vendor/composer/autoload_psr4.php (added)
• vendor/composer/autoload_real.php (added)
• vendor/composer/installed.json (added)

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Admin_Page.php

@@ -198 +198 @@
                 'default' => 0,
             )
+        );
+
+        register_setting(
+            self::MENU_SLUG,
+            self::OPTION_ACCOUNT_PAGE,
+            'intval'
         );
     }

mailgun-subscriptions/trunk/Mailgun_Subscriptions/Plugin.php

@@ -6 +6 @@
 
 class Plugin {
-    const VERSION = '1.1.1';
+    const VERSION = '1.1.2';
 
     /** @var Plugin */
@@ -68 +68 @@
     private function setup( $plugin_file ) {
         self::$plugin_file = $plugin_file;
-        spl_autoload_register( array( __CLASS__, 'autoload' ) );
         if ( is_admin() ) {
             $this->setup_admin_page();
@@ -205 +204 @@
         return self::$instance;
     }
-
-    public static function autoload( $class ) {
-        if (substr($class, 0, strlen(__NAMESPACE__)) != __NAMESPACE__) {
-            //Only autoload libraries from this package
-            return;
-        }
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, $class);
-        $path = dirname(self::$plugin_file) . DIRECTORY_SEPARATOR . $path . '.php';
-        if (file_exists($path)) {
-            require $path;
-        }
-    }
 } 

mailgun-subscriptions/trunk/mailgun-subscriptions.php

@@ -6 +6 @@
 Author: Flightless
 Author URI: http://flightless.us/
-Version: 1.1.1
+Version: 1.1.2
 Text Domain: mailgun-subscriptions
 Domain Path: /languages
@@ -14 +14 @@
 
     function mailgun_subscriptions_load() {
+        require_once( __DIR__ . '/vendor/autoload.php' );
         add_action( 'init', 'mailgun_load_textdomain', 10, 0 );
         if ( mailgun_subscriptions_version_check() ) {
-            require_once('Mailgun_Subscriptions/Plugin.php');
             \Mailgun_Subscriptions\Plugin::init(__FILE__);
         } else {

mailgun-subscriptions/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.9
 Tested up to: 4.6
-Stable tag: 1.1.1
-License: BSD 3-Clause
-License URI: http://opensource.org/licenses/BSD-3-Clause
+Stable tag: 1.1.2
+License: GPL-2.0
+License URI: https://opensource.org/licenses/GPL-2.0
 
 Add a Mailgun subscription form to your WordPress site. Your visitors can use the form to subscribe to your lists using the Mailgun API.
@@ -21 +21 @@
 == Changelog ==
 
+= 1.1.2 =
+
+* Fix fatal error during uninstall
+* Fix error saving account management page ID
+
+= 1.1.1 =
+
+* Validate email address when requesting token to manage account
+* Disable caching of subscription management page
+
 = 1.1 =
 

mailgun-subscriptions/trunk/uninstall.php

@@ -5 +5 @@
 }
 
-require_once('Mailgun_Subscriptions/Cleanup.php');
+require_once( __DIR__ . '/vendor/autoload.php' );
 
 function mailgun_clear_cron() {
@@ -18 +18 @@
 function mailgun_clear_options() {
     foreach ( array(
+        'mailgun_account_management_page',
         'mailgun_api_key',
         'mailgun_api_public_key',
+        'mailgun_confirmation_email_template',
+        'mailgun_confirmation_expiration',
         'mailgun_confirmation_page',
-        'mailgun_confirmation_expiration',
-        'mailgun_confirmation_email_template',
+        'mailgun_lists',
+        'mailgun_token_email_template',
         'mailgun_welcome_email_template',
-        'mailgun_lists',
     ) as $option ) {
         delete_option( $option );