Changeset 7662

Timestamp:

09/12/2018 03:25:57 AM (6 years ago)

Author:

dd32

Message:

Slack: Correct r7661 to use a DB query to get the user_login as WordPress isn't loaded for these APIs (although $wpdb exists).

See #3799.

File:

• sites/trunk/common/includes/slack/announce/lib.php (modified) (1 diff)

sites/trunk/common/includes/slack/announce/lib.php

@@ -66 +66 @@
     // Find the user_login for the Slack user_id
     if ( isset( $data['user_id'] ) ) {
-        $wp_user_id = $wpdb->get_var( $wpdb->prepare(
-            "SELECT user_id FROM slack_users WHERE slack_id = %s",
+        $user = $wpdb->get_var( $wpdb->prepare(
+            "SELECT user_login
+            FROM slack_users
+                JOIN {$wpdb->users} ON slack_users.user_id = {$wpdb->users}.id
+            WHERE slack_id = %s",
             $data['user_id']
         ) );
-        if ( $user = get_user_by( 'id', $wp_user_id ) ) {
-            $user = $user->user_login;
-        }
     }
     // Default back to the historical 'user_name' Slack field.