Index: trunk/wp-admin/includes/template.php =================================================================== --- trunk/wp-admin/includes/template.php (revision 11743) +++ trunk/wp-admin/includes/template.php (revision 11748) @@ -1982,11 +1982,11 @@ * @since unknown * - * @param unknown_type $status - * @param unknown_type $s - * @param unknown_type $start - * @param unknown_type $num - * @param unknown_type $post - * @param unknown_type $type - * @return unknown + * @param string $status Comment status (approved, spam, deleted, etc) + * @param string $s Term to search for + * @param int $start Offset to start at for pagination + * @param int $num Maximum number of comments to return + * @param int $post Post ID or 0 to return all comments + * @param string $type Comment type (comment, trackback, pingback, etc) + * @return array [0] contains the comments and [1] contains the total number of comments that match (ignoring $start and $num) */ function _wp_get_comment_list( $status = '', $s = false, $start, $num, $post = 0, $type = '' ) { @@ -2028,10 +2028,8 @@ if ( 'comment' == $type ) $typesql = "AND comment_type = ''"; - elseif ( 'pingback' == $type ) - $typesql = "AND comment_type = 'pingback'"; - elseif ( 'trackback' == $type ) - $typesql = "AND comment_type = 'trackback'"; elseif ( 'pings' == $type ) $typesql = "AND ( comment_type = 'pingback' OR comment_type = 'trackback' )"; + elseif ( !empty($type) ) + $typesql = $wpdb->prepare("AND comment_type = %s", $type); else $typesql = ''; @@ -2123,5 +2121,5 @@ printf(__('Submitted on %2$s at %3$s'), get_comment_link($comment->comment_ID), get_comment_date(__('Y/m/d')), get_comment_date(__('g:ia'))); echo ''; - comment_text(); + comment_text(); if ( $user_can ) { ?>