WP Merge to rev 4273

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@788 7be80a69-a1ef-0310-a953-fb0f7c49ff36

5 files changed, 32 insertions, 19 deletions

diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index d2d8560..446ea46 100644
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -316,34 +316,36 @@ function wp_list_bookmarks($args = '') {
 	else
 		parse_str($args, $r);
 
-	$defaults = array('orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => 0,
+	$defaults = array('orderby' => 'name', 'order' => 'ASC', 'limit' => -1, 'category' => '',
 		'category_name' => '', 'hide_invisible' => 1, 'show_updated' => 0, 'echo' => 1,
 		'categorize' => 1, 'title_li' => __('Bookmarks'), 'title_before' => '<h2>', 'title_after' => '</h2>',
 		'category_orderby' => 'name', 'category_order' => 'ASC');
 	$r = array_merge($defaults, $r);
 	extract($r);
 
-	// TODO: The rest of it.
-	// If $categorize, group links by category with the category name being the
-	// title of each li, otherwise just list them with title_li as the li title.
-	// If $categorize and $category or $category_name, list links for the given category
-	// with the category name as the title li.  If not $categorize, use title_li.
-	// When using each category's name as a title li, use before and after args for specifying
-	// any markup.  We don't want to hardcode h2.
-
 	$output = '';
 
 	if ( $categorize ) {
-		$cats = get_categories("type=link&orderby=$category_orderby&order=$category_order&hierarchical=0");
+		//Split the bookmarks into ul's for each category
+		$cats = get_categories("type=link&category_name=$category_name&include=$category&orderby=$category_orderby&order=$category_order&hierarchical=0");
+
 		foreach ( (array) $cats as $cat ) {
-			$r['category'] = $cat->cat_ID;
-			$bookmarks = get_bookmarks($r);
+			$bookmarks = get_bookmarks("limit=$limit&category={$cat->cat_ID}&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_inivisible&show_updated=$show_updated");
 			if ( empty($bookmarks) )
 				continue;
 			$output .= "<li id='linkcat-$cat->cat_ID' class='linkcat'>$title_before$cat->cat_name$title_after\n\t<ul>\n";
 			$output .= _walk_bookmarks($bookmarks, $r);
 			$output .= "\n\t</ul>\n</li>\n";
 		}
+	} else {
+		//output one single list using title_li for the title
+		$bookmarks = get_bookmarks("limit=$limit&category=$category&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_inivisible&show_updated=$show_updated");
+		
+		if ( !empty($bookmarks) ) {
+			$output .= "<li id='linkuncat' class='linkcat'>$title_before$title_li$title_after\n\t<ul>\n";
+			$output .= _walk_bookmarks($bookmarks, $r);
+			$output .= "\n\t</ul>\n</li>\n";
+		}
 	}
 
 	if ( !$echo )
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 3189b14..6ffcfcc 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -187,9 +187,10 @@ function wp_allow_comment($commentdata) {
 	if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$comment_author_IP' OR comment_author_email = '$comment_author_email' ORDER BY comment_date DESC LIMIT 1") ) {
 		$time_lastcomment = mysql2date('U', $lasttime);
 		$time_newcomment  = mysql2date('U', $comment_date_gmt);
-		if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+		$flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
+		if ( $flood_die ) {
 			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
-			wp_die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
+			wp_die( __('You are posting comments too quickly.  Slow down.') );
 		}
 	}
 
@@ -355,6 +356,14 @@ function wp_filter_comment($commentdata) {
 	return $commentdata;
 }
 
+function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
+	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+		return $block;
+	if ( ($time_newcomment - $time_lastcomment) < 15 )
+		return true;
+	return false;
+}
+
 function wp_new_comment( $commentdata ) {
 	$commentdata = apply_filters('preprocess_comment', $commentdata);
 
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 75f24ed..ad60242 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -38,6 +38,8 @@ add_filter('comment_author', 'wp_specialchars');
 
 add_filter('comment_email', 'antispambot');
 
+add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
+
 add_filter('comment_url', 'clean_url');
 
 add_filter('comment_text', 'convert_chars');
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 421710d..7c3ce30 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -102,7 +102,7 @@ function get_author_rss_link($echo = false, $author_id, $author_nicename) {
        if ('' == $permalink_structure) {
 				 $link = get_option('home') . '?feed=rss2&amp;author=' . $author_id;
        } else {
-				 $link = get_author_link(0, $author_id, $author_nicename);
+				 $link = get_author_posts_url($author_id, $author_nicename);
 				 $link = $link . "feed/";
        }
 			 
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 0c33ad7..71e28fa 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -272,12 +272,12 @@ function wp_redirect($location, $status = 302) {
 	$strip = array('%0d', '%0a');
 	$location = str_replace($strip, '', $location);
 
-	status_header($status);
-
-	if ($is_IIS)
+	if ( $is_IIS ) {
 		header("Refresh: 0;url=$location");
-	else
+	} else {
+		status_header($status); // This causes problems on IIS
 		header("Location: $location");
+	}
 }
 endif;