Skip to:
Content

Changeset 6330


Ignore:
Timestamp:
09/13/12 21:29:11 (20 months ago)
Author:
boonebgorges
Message:

Use correct argument swapping in BP_Activity_Activity::save() for item_id and secondary_item_id

Since BP 1.6, the item_id and secondary_item_id columns of the activity table
have been bigint rather than varchar. This changeset fixes the argument
swapping in BP_Activity_Activity::save() to use the appropriate %d rather than
%s, so that null values turn into zeroes. This helps to avoid errors on certain
strict MySQL setups.

Fixes #4253

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.6/bp-activity/bp-activity-classes.php

    r6167 r6330  
    8585        // If we have an existing ID, update the activity item, otherwise insert it. 
    8686        if ( $this->id ) 
    87             $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %s, secondary_item_id = %s, hide_sitewide = %d, is_spam = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam, $this->id ); 
    88         else 
    89             $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide, is_spam ) VALUES ( %d, %s, %s, %s, %s, %s, %s, %s, %s, %d, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam ); 
     87            $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %d, secondary_item_id = %d, hide_sitewide = %d, is_spam = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam, $this->id ); 
     88        else 
     89            $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide, is_spam ) VALUES ( %d, %s, %s, %s, %s, %s, %s, %d, %d, %d, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam ); 
    9090 
    9191        if ( false === $wpdb->query( $q ) ) 
Note: See TracChangeset for help on using the changeset viewer.