From 771cb4fe1eb1543d6374930b89158f67836cb0f7 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 5 Dec 2018 08:22:35 -0800 Subject: [PATCH 1/3] add .gitignore for .DS_Store files --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..496ee2c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file From 8c31629120511f99e511c1e964072ea9ffbb621a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 5 Dec 2018 08:26:57 -0800 Subject: [PATCH 2/3] Fix a GROUP BY MySQL strict mode issues --- system/user/addons/vmg_chosen_member/helper.php | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100644 => 100755 system/user/addons/vmg_chosen_member/helper.php diff --git a/system/user/addons/vmg_chosen_member/helper.php b/system/user/addons/vmg_chosen_member/helper.php old mode 100644 new mode 100755 index cf6e950..aa8f795 --- a/system/user/addons/vmg_chosen_member/helper.php +++ b/system/user/addons/vmg_chosen_member/helper.php @@ -49,6 +49,11 @@ public function memberAssociations($entry_id = null, $field_id = null, $col_id = if ( ! isset($this->cache['memberAssociations'][$cache_key])) { + if ( ! empty($group_by)) + { + ee()->db->select($group_by); + } + // Return specific fields from query if ( ! is_null($select_fields)) { ee()->db->select($select_fields); @@ -105,6 +110,11 @@ public function memberAssociations($entry_id = null, $field_id = null, $col_id = $order_by = 'vcm.order'; } + if ( ! empty($group_by)) + { + ee()->db->group_by($order_by); + } + if (isset($settings['sort']) && strtolower($settings['sort']) == 'desc') { $sort = 'desc'; } else { From d1bfd659a482d5168e31de2a9ab72801bf49b672 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 5 Dec 2018 08:28:55 -0800 Subject: [PATCH 3/3] Patch version bump to 3.1.1 --- system/user/addons/vmg_chosen_member/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/user/addons/vmg_chosen_member/config.php b/system/user/addons/vmg_chosen_member/config.php index a24de9c..7976aa1 100644 --- a/system/user/addons/vmg_chosen_member/config.php +++ b/system/user/addons/vmg_chosen_member/config.php @@ -10,7 +10,7 @@ if ( ! defined('VMG_CM_VERSION')) { - define('VMG_CM_VERSION', '3.1'); + define('VMG_CM_VERSION', '3.1.1'); } /**