From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 15 Dec 2017 16:46:27 +0000 (-0500)
Subject: Corrected hook name conflicts for customfields plugin (conflicted with "fields" plugin)
X-Git-Tag: v1.0.0^2~198
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=53a76d808143431cbea2a20bd29ba61d2eda1ae1;p=WP-Plugins%2Fglm-member-db-registrations.git

Corrected hook name conflicts for customfields plugin (conflicted with "fields" plugin)
---

diff --git a/models/front/registrations/checkoutProcess.php b/models/front/registrations/checkoutProcess.php
index 1ab3e73..adf5d4a 100644
--- a/models/front/registrations/checkoutProcess.php
+++ b/models/front/registrations/checkoutProcess.php
@@ -222,7 +222,7 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
          */
 
         // Process and store any custom fields for events
-        if (apply_filters('glm-members-customfields-active', false)) {
+        if (apply_filters('glm-members-customfields-plugin-active', false)) {
 
             // For each event, see if there's any custom fields
             foreach ($this->cart['events'] as $eventKey=>$eventData) {
diff --git a/views/admin/registrations/eventEditCustomFields.html b/views/admin/registrations/eventEditCustomFields.html
index 3a9bbc9..a5283fd 100644
--- a/views/admin/registrations/eventEditCustomFields.html
+++ b/views/admin/registrations/eventEditCustomFields.html
@@ -7,7 +7,7 @@
         {if $regEventAdded}<span class="glm-notice glm-flash-updated">Registration Event Added</span>{/if}
     </h1>
     
-{if apply_filters('glm-members-customfields-active', false)}
+{if apply_filters('glm-members-customfields-plugin-active', false)}
     <p><hr></p>
 
     {* Per Event Form for this event *}
@@ -16,7 +16,7 @@
     <p>
         {assign var="eventFid" value="glm_reg_customfields_reg_event_`$regEventID`"}
 {$eventFid}        
-        {apply_filters('glm-members-customfields-edit', '', $eventFid)}
+        {apply_filters('glm-members-customfields-form-edit', '', $eventFid)}
     </p>
 
     {* Per Attendee Form for this event *}
@@ -26,7 +26,7 @@
     <p> 
         {assign var="attendeeFid" value="glm_reg_customfields_reg_event_attendee_`$regEventID`"}
 {$attendeeFid}     
-        {apply_filters('glm-members-customfields-edit', '', $attendeeFid)}
+        {apply_filters('glm-members-customfields-form-edit', '', $attendeeFid)}
     </p>
 
     {* Per Attendee form for each class (level) for this event *}
@@ -37,7 +37,7 @@
     <p> 
         {assign var="levelFid" value="glm_reg_customfields_reg_event_`$regEventID`_level_`$class.id`"}
 {$levelFid}  
-        {apply_filters('glm-members-customfields-edit', '', $levelFid)}
+        {apply_filters('glm-members-customfields-form-edit', '', $levelFid)}
     </p>
     <p><hr></p>
   {/foreach}
diff --git a/views/admin/registrations/eventSubTabs.html b/views/admin/registrations/eventSubTabs.html
index 6e696f8..cdc1357 100644
--- a/views/admin/registrations/eventSubTabs.html
+++ b/views/admin/registrations/eventSubTabs.html
@@ -10,7 +10,7 @@
         <a {if $option=="eventDashboard"}onClick="return false;" class="nav-tab nav-tab-active"{else}href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=eventDashboard&regEventID={$regEventID}" class="nav-tab"{/if}>Event Dashboard</a>
         <a {if $option=="edit"}onClick="return false;" class="nav-tab nav-tab-active"{else}href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=edit&regEventID={$regEventID}" class="nav-tab"{/if}>Edit Registration Settings</a>
         <a {if $option=="configureEvent"}onClick="return false;" class="nav-tab nav-tab-active"{else}href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=configureEvent&regEventID={$regEventID}" class="nav-tab"{/if}>Registration Levels & Charges</a> 
-{if apply_filters('glm-members-customfields-active', false)}        
+{if apply_filters('glm-members-customfields-plugin-active', false)}        
         <a {if $option=="eventCustomFields"}onClick="return false;" class="nav-tab nav-tab-active"{else}href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=eventCustomFields&regEventID={$regEventID}" class="nav-tab"{/if}>Additional Fields</a>
 {/if}
         <a {if $option=="registrants"}onClick="return false;" class="nav-tab nav-tab-active"{else}href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=registrants&regEventID={$regEventID}" class="nav-tab"{/if}>Registratants</a> 
diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html
index 9d7f2bf..c37d16e 100644
--- a/views/front/registrations/checkout.html
+++ b/views/front/registrations/checkout.html
@@ -263,7 +263,7 @@
                 </div>
   {/if} {* / total charges > 0 *}
             </div>
-    {if apply_filters('glm-members-customfields-active', false)}
+    {if apply_filters('glm-members-customfields-plugin-active', false)}
       {foreach $cart.events as $event}
         {assign var="fid" value="glm_reg_customfields_reg_event_`$event.reg_event`"} {* assemble the uid with the current event ID *}      
         {if apply_filters('glm-members-customfields-have-fields', false, $fid)}            <div class="glm-row">