Index: wp-includes/comment.php =================================================================== --- wp-includes/comment.php (revision 17501) +++ wp-includes/comment.php (working copy) @@ -320,7 +320,7 @@ $where .= $this->get_search_sql( $search, array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' ) ); $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' ); - $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) ); + $clauses = apply_filters( 'comments_clauses', compact( $pieces ), $this ); foreach ( $pieces as $piece ) $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; @@ -330,7 +330,7 @@ return $wpdb->get_var( $query ); $comments = $wpdb->get_results( $query ); - $comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) ); + $comments = apply_filters( 'the_comments', $comments, $this ); wp_cache_add( $cache_key, $comments, 'comment' ); Index: wp-includes/meta.php =================================================================== --- wp-includes/meta.php (revision 17501) +++ wp-includes/meta.php (working copy) @@ -442,7 +442,7 @@ $where .= $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string}", $meta_value ); } - return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column, &$context ) ); + return apply_filters( 'get_meta_sql', array( compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column, $context ) ); } /** Index: wp-includes/query.php =================================================================== --- wp-includes/query.php (revision 17501) +++ wp-includes/query.php (working copy) @@ -2147,7 +2147,7 @@ } // Allow plugins to contextually add/remove/modify the search section of the database query - $search = apply_filters_ref_array('posts_search', array( $search, &$this ) ); + $search = apply_filters( 'posts_search', $search, $this ); // Taxonomies $this->parse_tax_query( $q ); @@ -2451,8 +2451,8 @@ // Apply filters on where and join prior to paging so that any // manipulations to them are reflected in the paging by day queries. if ( !$q['suppress_filters'] ) { - $where = apply_filters_ref_array('posts_where', array( $where, &$this ) ); - $join = apply_filters_ref_array('posts_join', array( $join, &$this ) ); + $where = apply_filters( 'posts_where', $where, $this ); + $join = apply_filters( 'posts_join', $join, $this ); } // Paging @@ -2485,11 +2485,11 @@ } if ( !$q['suppress_filters'] ) { - $cjoin = apply_filters_ref_array('comment_feed_join', array( $cjoin, &$this ) ); - $cwhere = apply_filters_ref_array('comment_feed_where', array( $cwhere, &$this ) ); - $cgroupby = apply_filters_ref_array('comment_feed_groupby', array( $cgroupby, &$this ) ); - $corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) ); - $climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) ); + $cjoin = apply_filters('comment_feed_join', $cjoin, $this ); + $cwhere = apply_filters('comment_feed_where', $cwhere, $this ); + $cgroupby = apply_filters('comment_feed_groupby', $cgroupby, $this ); + $corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC', $this ); + $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss'), $this ); } $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : ''; $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : ''; @@ -2517,16 +2517,16 @@ // Apply post-paging filters on where and join. Only plugins that // manipulate paging queries should use these hooks. if ( !$q['suppress_filters'] ) { - $where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) ); - $groupby = apply_filters_ref_array( 'posts_groupby', array( $groupby, &$this ) ); - $join = apply_filters_ref_array( 'posts_join_paged', array( $join, &$this ) ); - $orderby = apply_filters_ref_array( 'posts_orderby', array( $orderby, &$this ) ); - $distinct = apply_filters_ref_array( 'posts_distinct', array( $distinct, &$this ) ); - $limits = apply_filters_ref_array( 'post_limits', array( $limits, &$this ) ); - $fields = apply_filters_ref_array( 'posts_fields', array( $fields, &$this ) ); + $where = apply_filters( 'posts_where_paged', $where, $this ); + $groupby = apply_filters( 'posts_groupby', $groupby, $this ); + $join = apply_filters( 'posts_join_paged', $join, $this ); + $orderby = apply_filters( 'posts_orderby', $orderby, $this ); + $distinct = apply_filters( 'posts_distinct', $distinct, $this ); + $limits = apply_filters( 'post_limits', $limits, $this ); + $fields = apply_filters( 'posts_fields', $fields, $this ); // Filter all clauses at once, for convenience - $clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) ); + $clauses = (array) apply_filters( 'posts_clauses', compact( $pieces ), $this ); foreach ( $pieces as $piece ) $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; } @@ -2536,16 +2536,16 @@ // Filter again for the benefit of caching plugins. Regular plugins should use the hooks above. if ( !$q['suppress_filters'] ) { - $where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) ); - $groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) ); - $join = apply_filters_ref_array( 'posts_join_request', array( $join, &$this ) ); - $orderby = apply_filters_ref_array( 'posts_orderby_request', array( $orderby, &$this ) ); - $distinct = apply_filters_ref_array( 'posts_distinct_request', array( $distinct, &$this ) ); - $fields = apply_filters_ref_array( 'posts_fields_request', array( $fields, &$this ) ); - $limits = apply_filters_ref_array( 'post_limits_request', array( $limits, &$this ) ); + $where = apply_filters( 'posts_where_request', $where, $this ); + $groupby = apply_filters( 'posts_groupby_request', $groupby, $this ); + $join = apply_filters( 'posts_join_request', $join, $this ); + $orderby = apply_filters( 'posts_orderby_request', $orderby, $this ); + $distinct = apply_filters( 'posts_distinct_request', $distinct, $this ); + $fields = apply_filters( 'posts_fields_request', $fields, $this ); + $limits = apply_filters( 'post_limits_request', $limits, $this ); // Filter all clauses at once, for convenience - $clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) ); + $clauses = (array) apply_filters( 'posts_clauses_request', compact( $pieces ), $this ); foreach ( $pieces as $piece ) $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : ''; } @@ -2561,7 +2561,7 @@ $this->request = " SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits"; if ( !$q['suppress_filters'] ) - $this->request = apply_filters_ref_array('posts_request', array( $this->request, &$this ) ); + $this->request = apply_filters('posts_request', $this->request, $this ); if ( 'ids' == $q['fields'] ) { $this->posts = $wpdb->get_col($this->request); @@ -2583,25 +2583,25 @@ // Raw results filter. Prior to status checks. if ( !$q['suppress_filters'] ) - $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) ); + $this->posts = apply_filters('posts_results', $this->posts, $this ); if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) { - $cjoin = apply_filters_ref_array('comment_feed_join', array( '', &$this ) ); - $cwhere = apply_filters_ref_array('comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) ); - $cgroupby = apply_filters_ref_array('comment_feed_groupby', array( '', &$this ) ); + $cjoin = apply_filters('comment_feed_join', '', $this ); + $cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", $this ); + $cgroupby = apply_filters('comment_feed_groupby', '', $this ); $cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : ''; - $corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) ); + $corderby = apply_filters('comment_feed_orderby', 'comment_date_gmt DESC', $this ); $corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : ''; - $climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) ); + $climits = apply_filters('comment_feed_limits', 'LIMIT ' . get_option('posts_per_rss'), $this ); $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits"; $this->comments = $wpdb->get_results($comments_request); $this->comment_count = count($this->comments); } if ( !$q['no_found_rows'] && !empty($limits) ) { - $found_posts_query = apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ); + $found_posts_query = apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()', $this ); $this->found_posts = $wpdb->get_var( $found_posts_query ); - $this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) ); + $this->found_posts = apply_filters( 'found_posts', $this->found_posts, $this ); $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']); } @@ -2634,7 +2634,7 @@ } if ( $this->is_preview && current_user_can( $edit_cap, $this->posts[0]->ID ) ) - $this->posts[0] = apply_filters_ref_array('the_preview', array( $this->posts[0], &$this )); + $this->posts[0] = apply_filters('the_preview', $this->posts[0], $this ); } // Put sticky posts at the top of the posts array @@ -2688,7 +2688,7 @@ } if ( !$q['suppress_filters'] ) - $this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) ); + $this->posts = apply_filters('the_posts', $this->posts, $this ); $this->post_count = count($this->posts);