From 57b5c16073a882c36c4bf71c269d23619d7a71cd Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Fri, 9 Nov 2018 07:50:43 -0500
Subject: [PATCH] Fix Synchronize users for Multi-Site. Props Christian Wach
Signed-off-by: Kevin Cristiano <kcristiano@tadpole.cc>
---
civicrm/CRM/Utils/System/WordPress.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index f2df6c8476..7bdb1e9ea1 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -767,11 +767,13 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
$contactCreated = 0;
$contactMatching = 0;
- global $wpdb;
- $wpUserIds = $wpdb->get_col("SELECT $wpdb->users.ID FROM $wpdb->users");
+ // previously used $wpdb - which means WordPress *must* be bootstrapped
+ $wpUsers = get_users(array(
+ 'blog_id' => get_current_blog_id(),
+ 'number' => -1,
+ ));
- foreach ($wpUserIds as $wpUserId) {
- $wpUserData = get_userdata($wpUserId);
+ foreach ($wpUsers as $wpUserData) {
$contactCount++;
if ($match = CRM_Core_BAO_UFMatch::synchronizeUFMatch($wpUserData,
$wpUserData->$id,
--
GitLab