From a41113336b31c0545084d2a07d7b5321ebb051cb Mon Sep 17 00:00:00 2001
From: Christian Wach <needle@haystack.co.uk>
Date: Tue, 10 Nov 2015 10:12:11 +0000
Subject: [PATCH] pass user ID not user object to `wp_set_current_user()`

---
 CRM/Utils/System/WordPress.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index bb4b8e721e..885ea46934 100644
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -367,7 +367,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
       $name = $name ? $name : trim(CRM_Utils_Array::value('name', $_REQUEST));
       $pass = $pass ? $pass : trim(CRM_Utils_Array::value('pass', $_REQUEST));
       if ($name) {
-        $uid = wp_authenticate($name, $pass);
+        $uid = wp_authenticate($name, $pass); // this returns a WP_User object if successful
         if (!$uid) {
           if ($throwError) {
             echo '<br />Sorry, unrecognized username or password.';
@@ -378,7 +378,11 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
       }
     }
     if ($uid) {
-      $account = wp_set_current_user($uid);
+      if ($uid instanceof WP_User) {
+        $account = wp_set_current_user($uid->ID);
+      } else {
+        $account = wp_set_current_user($uid);
+      }
       if ($account && $account->data->ID) {
         global $user;
         $user = $account;
-- 
2.25.1