Changeset 5913

Timestamp:

03/13/2012 09:35:47 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Run $page and $per_page through absint in BP_Activity_Activity::get() (branches/1.5)

File:

• branches/1.5/bp-activity/bp-activity-classes.php (modified) (1 diff)

branches/1.5/bp-activity/bp-activity-classes.php

@@ -156 +156 @@
                 $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
 
-                if ( $per_page && $page ) {
-                        $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
+                if ( !empty( $per_page ) && !empty( $page ) ) {
+
+                        // Make sure page values are absolute integers
+                        $page     = absint( $page     );
+                        $per_page = absint( $per_page );
+
+                        $pag_sql = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
                         $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ), $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
                 } else {