Changeset 10853

Timestamp:

06/01/2016 04:59:31 PM (9 years ago)

Author:

r-a-y

Message:

Activity: Cast activity properties as integers where appropriate.

Props DJPaul, r-a-y.

See #6977.

Location:

trunk/src

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-activity/bp-activity-embeds.php (modified) (1 diff)
• bp-activity/bp-activity-functions.php (modified) (2 diffs)
• bp-activity/bp-activity-screens.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (3 diffs)
• bp-activity/classes/class-bp-activity-activity.php (modified) (6 diffs)
• bp-blogs/bp-blogs-activity.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-admin.php

@@ -580 +580 @@
         // If an error occurred, pass back the activity ID that failed.
         if ( $error )
-            $redirect_to = add_query_arg( 'error', (int) $error, $redirect_to );
+            $redirect_to = add_query_arg( 'error', $error, $redirect_to );
         else
-            $redirect_to = add_query_arg( 'updated', (int) $activity->id, $redirect_to );
+            $redirect_to = add_query_arg( 'updated', $activity->id, $redirect_to );
 
         /**

trunk/src/bp-activity/bp-activity-embeds.php

@@ -104 +104 @@
 
         // No need to requery if we already got the embed activity
-        if ( (int) $activity_id === (int) $activity->id ) {
+        if ( (int) $activity_id === $activity->id ) {
             return $activities_template->has_activities();
         }

trunk/src/bp-activity/bp-activity-functions.php

@@ -170 +170 @@
 
     // Get activity object.
-    $activity  = new BP_Activity_Activity( (int) $activity_id );
+    $activity  = new BP_Activity_Activity( $activity_id );
 
     // Try to find mentions.
@@ -2557 +2557 @@
 
     // Check to see if the parent activity is hidden, and if so, hide this comment publicly.
-    $is_hidden = ( (int) $activity->hide_sitewide ) ? 1 : 0;
+    $is_hidden = $activity->hide_sitewide ? 1 : 0;
 
     /**

trunk/src/bp-activity/bp-activity-screens.php

@@ -282 +282 @@
             $url = sprintf(
                 site_url( 'wp-login.php?redirect_to=%s' ),
-                urlencode( esc_url_raw( bp_activity_get_permalink( (int) bp_current_action() ) ) )
+                urlencode( esc_url_raw( bp_activity_get_permalink( bp_current_action() ) ) )
             );
         }

trunk/src/bp-activity/bp-activity-template.php

@@ -1564 +1564 @@
         // quite powerful, because doing so also deletes all comments to that
         // activity item. We should revisit this eventually.
-        if ( isset( $activity->user_id ) && ( (int) $activity->user_id === bp_loggedin_user_id() ) ) {
+        if ( isset( $activity->user_id ) && ( $activity->user_id === bp_loggedin_user_id() ) ) {
             $can_delete = true;
         }
@@ -1617 +1617 @@
 
         // Get the ID of the parent activity content.
-        $parent_id = (int) $activities_template->activity->item_id;
+        $parent_id = $activities_template->activity->item_id;
 
         // Bail if no parent content.
@@ -1681 +1681 @@
 
         // Get the ID of the parent activity content.
-        $parent_id = (int) $activities_template->activity->item_id;
+        $parent_id = $activities_template->activity->item_id;
 
         // Bail if no parent item.

trunk/src/bp-activity/classes/class-bp-activity-activity.php

@@ -108 +108 @@
      * @var int
      */
-    var $hide_sitewide = false;
+    var $hide_sitewide = 0;
 
     /**
@@ -143 +143 @@
     public function __construct( $id = false ) {
         if ( !empty( $id ) ) {
-            $this->id = $id;
+            $this->id = (int) $id;
             $this->populate();
         }
@@ -176 +176 @@
             $this->content           = $row->content;
             $this->date_recorded     = $row->date_recorded;
-            $this->hide_sitewide     = $row->hide_sitewide;
+            $this->hide_sitewide     = (int) $row->hide_sitewide;
             $this->mptt_left         = (int) $row->mptt_left;
             $this->mptt_right        = (int) $row->mptt_right;
-            $this->is_spam           = $row->is_spam;
+            $this->is_spam           = (int) $row->is_spam;
         }
 
@@ -709 +709 @@
         // Now fetch data from the cache.
         foreach ( $activity_ids as $activity_id ) {
-            $activities[] = wp_cache_get( $activity_id, 'bp_activity' );
+            // Integer casting.
+            $activity = wp_cache_get( $activity_id, 'bp_activity' );
+            if ( ! empty( $activity ) ) {
+                $activity->id                = (int) $activity->id;
+                $activity->user_id           = (int) $activity->user_id;
+                $activity->item_id           = (int) $activity->item_id;
+                $activity->secondary_item_id = (int) $activity->secondary_item_id;
+                $activity->hide_sitewide     = (int) $activity->hide_sitewide;
+                $activity->mptt_left         = (int) $activity->mptt_left;
+                $activity->mptt_right        = (int) $activity->mptt_right;
+                $activity->is_spam           = (int) $activity->is_spam;
+            }
+
+            $activities[] = $activity;
         }
 
@@ -1072 +1085 @@
         if ( ! empty( $where_args ) ) {
             $where_sql = 'WHERE ' . join( ' AND ', $where_args );
-            return $wpdb->get_var( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
+            $result = $wpdb->get_var( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" );
+
+            return is_numeric( $result ) ? (int) $result : false;
         }
 
@@ -1764 +1779 @@
         $bp = buddypress();
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE content = %s", $content ) );
+        $result = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE content = %s", $content ) );
+
+        return is_numeric( $result ) ? (int) $result : false;
     }
 

trunk/src/bp-blogs/bp-blogs-activity.php

@@ -949 +949 @@
     remove_action( 'bp_activity_post_type_comment', 'bp_blogs_comment_sync_activity_comment',          10, 4 );
 
-    if ( 1 === (int) $activity->is_spam && 'spam' !== $post_comment_status ) {
+    if ( 1 === $activity->is_spam && 'spam' !== $post_comment_status ) {
         wp_spam_comment( $post_comment_id );
     } elseif ( ! $activity->is_spam ) {