WP Merge

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

3 files changed, 7 insertions, 6 deletions

diff --git a/wp-inst/wp-includes/capabilities.php b/wp-inst/wp-includes/capabilities.php
index 1943689..e279ce4 100644
--- a/wp-inst/wp-includes/capabilities.php
+++ b/wp-inst/wp-includes/capabilities.php
@@ -22,7 +22,10 @@ class WP_Roles {
 		}
 	}
 
-	function add_role($role, $capabilities, $display_name) {
+	function add_role($role, $display_name, $capabilities = '') {
+		if ( isset($this->roles[$role]) )
+			return;
+
 		$this->roles[$role] = array('name' => $display_name,
 																'capabilities' => $capabilities);
 		update_option($this->role_key, $this->roles);
@@ -41,7 +44,7 @@ class WP_Roles {
 		update_option($this->role_key, $this->roles);
 	}
 
-	function add_cap($role, $cap, $grant) {
+	function add_cap($role, $cap, $grant = true) {
 		$this->roles[$role]['capabilities'][$cap] = $grant;
 		update_option($this->role_key, $this->roles);
 	}
@@ -77,7 +80,7 @@ class WP_Role {
 		$this->capabilities = $capabilities;
 	}
 
-	function add_cap($cap, $grant) {
+	function add_cap($cap, $grant = true) {
 		global $wp_roles;
 
 		$this->capabilities[$cap] = $grant;
diff --git a/wp-inst/wp-includes/default-filters.php b/wp-inst/wp-includes/default-filters.php
index 5b988a9..50c6eca 100644
--- a/wp-inst/wp-includes/default-filters.php
+++ b/wp-inst/wp-includes/default-filters.php
@@ -25,7 +25,6 @@ add_filter('pre_comment_author_url', 'trim');
 add_filter('pre_comment_author_url', 'clean_url');
 
 add_filter('pre_comment_content', 'stripslashes', 1);
-add_filter('pre_comment_content', 'wp_filter_kses');
 add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
 add_filter('pre_comment_content', 'balanceTags', 30);
 add_filter('pre_comment_content', 'addslashes', 50);
@@ -85,4 +84,4 @@ add_filter('the_author', 'ent2ncr', 8);
 // Actions
 add_action('publish_post', 'generic_ping');
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-inst/wp-includes/functions-post.php b/wp-inst/wp-includes/functions-post.php
index e5db6c7..47ba7ed 100644
--- a/wp-inst/wp-includes/functions-post.php
+++ b/wp-inst/wp-includes/functions-post.php
@@ -325,7 +325,6 @@ function wp_delete_post($postid = 0) {
 
 	if ( 'static' == $post->post_status )
 		generate_page_rewrite_rules();
-
 	
 	return $post;
 }