From 0329f783ae7d77edc941729d0c45bdd15b82dcb7 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 19 Oct 2017 10:36:34 -0400 Subject: [PATCH] changing the member info specific method names admin hooks, and customfields support methods file, changed the member info specific method names to something more generic --- classes/customFieldPluginSupport.php | 11 ++++++----- models/admin/fields/fields.php | 2 +- setup/adminHooks.php | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/classes/customFieldPluginSupport.php b/classes/customFieldPluginSupport.php index b561633..c2f8c4a 100644 --- a/classes/customFieldPluginSupport.php +++ b/classes/customFieldPluginSupport.php @@ -14,15 +14,16 @@ * @access public * @return void */ -function customFieldsSaveMemberInfoFields( $memberId ) +function customFieldsSaveFields( $memberId ) { global $wpdb; // If no data for custom field then return if ( !isset( $_REQUEST['glm_custom_field'] ) ) { return false; } + // See if this memberInfo has current field data - $currentCustomFields = customFieldsGetMemberInfoFields( $memberId ); + $currentCustomFields = customFieldsGetFields( $memberId ); // Insert the custom field record $fieldDataFormat = array( '%d', @@ -59,10 +60,10 @@ function customFieldsSaveMemberInfoFields( $memberId ) } } -function customFieldsCloneMemberInfoFields( $oldId, $newId ) +function customFieldsCloneFields( $oldId, $newId ) { global $wpdb; - $customFields = customFieldsGetMemberInfoFields( $oldId ); + $customFields = customFieldsGetFields( $oldId ); $fieldDataFormat = array( '%d', '%d', @@ -95,7 +96,7 @@ function customFieldsCloneMemberInfoFields( $oldId, $newId ) * @access public * @return void */ -function customFieldsGetMemberInfoFields( $memberId ) +function customFieldsGetFields( $memberId ) { global $wpdb; if ( !$memberId ) { diff --git a/models/admin/fields/fields.php b/models/admin/fields/fields.php index b815863..df98639 100644 --- a/models/admin/fields/fields.php +++ b/models/admin/fields/fields.php @@ -153,7 +153,7 @@ class GlmMembersAdmin_fields_fields extends GlmDataFieldsCustomFields } require_once GLM_MEMBERS_FIELDS_PLUGIN_CLASS_PATH . '/customFieldPluginSupport.php'; - $customFieldsData = customFieldsGetMemberInfoFields( $memberId ); + $customFieldsData = customFieldsGetFields( $memberId ); // Compile template data $template_data = array( diff --git a/setup/adminHooks.php b/setup/adminHooks.php index 7423add..001deba 100644 --- a/setup/adminHooks.php +++ b/setup/adminHooks.php @@ -157,21 +157,21 @@ add_filter('glm-member-db-admin-search-query', function() { return $queryParts; }); add_action( - 'glm-member-db-member-info-save-custom-fields', + 'glm-member-db-save-custom-fields', function( $memberInfoId ){ require_once GLM_MEMBERS_FIELDS_PLUGIN_CLASS_PATH . '/customFieldPluginSupport.php'; // this will save the member data - customFieldsSaveMemberInfoFields( $memberInfoId ); + customFieldsSaveFields( $memberInfoId ); }, 1, 1 ); add_action( - 'glm-member-db-member-info-clone-custom-fields', + 'glm-member-db-clone-custom-fields', function( $memberInfoId, $newId ){ require_once GLM_MEMBERS_FIELDS_PLUGIN_CLASS_PATH . '/customFieldPluginSupport.php'; // this will clone the custom fields data - customFieldsCloneMemberInfoFields( $memberInfoId, $newId ); + customFieldsCloneFields( $memberInfoId, $newId ); }, 1, 2 -- 2.17.1