Changeset 11028 for trunk/src/bp-messages/classes/class-bp-messages-message.php

Timestamp:

08/22/2016 10:32:06 PM (10 years ago)

Author:

r-a-y

Message:

Messages: Cast properties as integers where appropriate.

See #6977.

File:

• trunk/src/bp-messages/classes/class-bp-messages-message.php (modified) (4 diffs)

trunk/src/bp-messages/classes/class-bp-messages-message.php

@@ -89 +89 @@
 
                 if ( $message = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_messages} WHERE id = %d", $id ) ) ) {
-                        $this->id        = $message->id;
-                        $this->thread_id = $message->thread_id;
-                        $this->sender_id = $message->sender_id;
+                        $this->id        = (int) $message->id;
+                        $this->thread_id = (int) $message->thread_id;
+                        $this->sender_id = (int) $message->sender_id;
                         $this->subject   = $message->subject;
                         $this->message   = $message->message;
@@ -221 +221 @@
                 $bp = buddypress();
 
-                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND thread_id = %d ORDER BY date_sent DESC LIMIT 1", bp_loggedin_user_id(), $thread_id ) );
+                $query = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND thread_id = %d ORDER BY date_sent DESC LIMIT 1", bp_loggedin_user_id(), $thread_id ) );
+
+                return is_numeric( $query ) ? (int) $query : $query;
         }
 
@@ -237 +239 @@
                 $bp = buddypress();
 
-                return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND id = %d", $user_id, $message_id ) );
+                $query = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_messages} WHERE sender_id = %d AND id = %d", $user_id, $message_id ) );
+
+                return is_numeric( $query ) ? (int) $query : $query;
         }
 
@@ -251 +255 @@
                 $bp = buddypress();
 
-                return $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) );
+                $query = $wpdb->get_var( $wpdb->prepare( "SELECT sender_id FROM {$bp->messages->table_name_messages} WHERE id = %d", $message_id ) );
+
+                return is_numeric( $query ) ? (int) $query : $query;
         }
 }