From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 31 Aug 2016 19:09:45 +0000 (-0400)
Subject: Use main default if no event plugin default state is set
X-Git-Tag: v1.3.3^2~5
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b2b660447e767e84e621f32ca22f12b1922ae89d;p=WP-Plugins%2Fglm-member-db-events.git

Use main default if no event plugin default state is set
---

diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php
index d88e26f..50ec87b 100644
--- a/models/front/events/frontAdd.php
+++ b/models/front/events/frontAdd.php
@@ -501,10 +501,14 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents
         remove_filter( 'wp_mail_content_type', 'set_content_type' );
 
         $view = 'confirmation';
-    }
+        }
+
+        $default_state = ( $this->config['settings']['default_state'] )
+            ? $this->config['settings']['default_state']
+            : ( $this->config['settings']['event_default_state'] ) ? $this->config['settings']['event_default_state']: 'MI';
         // Compile template data
         $templateData = array(
-            'state_def'   => $this->config['settings']['event_default_state'],
+            'state_def'   => $default_state,
             'siteBaseUrl' => GLM_MEMBERS_EVENTS_SITE_BASE_URL,
             'currentUrl'  => $_SERVER['HTTP_REFERER'],
             'categories'  => $eventCategories,