Changeset 11028

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.

Location:

trunk/src/bp-messages/classes

Files:

• class-bp-messages-message.php (modified) (4 diffs)
• class-bp-messages-notice.php (modified) (3 diffs)
• class-bp-messages-thread.php (modified) (2 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;
         }
 }

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

@@ -63 +63 @@
         public function __construct( $id = null ) {
                 if ( $id ) {
-                        $this->id = $id;
+                        $this->id = (int) $id;
                         $this->populate();
                 }
@@ -86 +86 @@
                         $this->message   = $notice->message;
                         $this->date_sent = $notice->date_sent;
-                        $this->is_active = $notice->is_active;
+                        $this->is_active = (int) $notice->is_active;
                 }
         }
@@ -233 +233 @@
                 $notices = $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" );
 
+                // Integer casting.
+                foreach ( (array) $notices as $key => $data ) {
+                        $notices[ $key ]->id        = (int) $notices[ $key ]->id;
+                        $notices[ $key ]->is_active = (int) $notices[ $key ]->is_active;
+                }
+
                 return $notices;
         }

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

@@ -255 +255 @@
                 }
 
+                // Cast all items from the messages DB table as integers.
+                foreach ( (array) $recipients as $key => $data ) {
+                        $recipients[ $key ] = (object) array_map( 'intval', (array) $data );
+                }
+
                 /**
                  * Filters the recipients of a message thread.
@@ -290 +295 @@
 
                         wp_cache_set( $thread_id, (array) $messages, 'bp_messages_threads' );
+                }
+
+                // Integer casting.
+                foreach ( $messages as $key => $data ) {
+                        $messages[ $key ]->id        = (int) $messages[ $key ]->id;
+                        $messages[ $key ]->thread_id = (int) $messages[ $key ]->thread_id;
+                        $messages[ $key ]->sender_id = (int) $messages[ $key ]->sender_id;
                 }