WP Merge

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

4 files changed, 12 insertions, 9 deletions

diff --git a/wp-inst/wp-admin/link-categories.php b/wp-inst/wp-admin/link-categories.php
index 1aad965..081f846 100644
--- a/wp-inst/wp-admin/link-categories.php
+++ b/wp-inst/wp-admin/link-categories.php
@@ -276,7 +276,7 @@ switch ($action) {
 
 <div class="wrap">
             <h2><?php _e('Link Categories:') ?></h2>
-            <table width="100%" cellpadding="5" cellspacing="0" border="0">
+            <table id="the-list" width="100%" cellpadding="5" cellspacing="0" border="0">
               <tr>
  	        <th rowspan="2" valign="bottom"><?php _e('Name') ?></th>
                 <th rowspan="2" valign="bottom"><?php _e('ID') ?></th>
@@ -334,7 +334,7 @@ foreach ($results as $row) {
     		break;
     }
 ?>
-              <tr valign="middle" align="center" <?php echo $style ?> style="border-bottom: 1px dotted #9C9A9C;">
+              <tr id="link-category-<?php echo $row->cat_id; ?>" valign="middle" align="center" <?php echo $style ?> style="border-bottom: 1px dotted #9C9A9C;">
                 <td><?php echo wp_specialchars($row->cat_name)?></td>
 				<td ><?php echo $row->cat_id?></td>
                 <td><?php echo $row->auto_toggle == 'Y' ? __('Yes') : __('No') ?></td>
@@ -349,7 +349,7 @@ foreach ($results as $row) {
                 <td nowrap="nowrap"><?php echo htmlentities($row->text_after_all)?></td>
                 <td><?php echo $row->list_limit ?></td>
                 <td><a href="link-categories.php?cat_id=<?php echo $row->cat_id?>&amp;action=Edit" class="edit"><?php _e('Edit') ?></a></td>
-                <td><a href="link-categories.php?cat_id=<?php echo $row->cat_id?>&amp;action=Delete" onclick="return confirm('<?php _e("You are about to delete this category.\\n  \'Cancel\' to stop, \'OK\' to delete.") ?>');" class="delete"><?php _e('Delete') ?></a></td>
+                <td><a href="link-categories.php?cat_id=<?php echo $row->cat_id?>&amp;action=Delete" onclick="return deleteSomething( 'link category', <?php echo $row->cat_id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; link category.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars($row->cat_name,1)); ?>' );" class="delete"><?php _e('Delete') ?></a></td>
               </tr>
 <?php
         ++$i;
@@ -358,6 +358,8 @@ foreach ($results as $row) {
             </table>
 <p><?php _e('These are the defaults for when you call a link category with no additional arguments. All of these settings may be overwritten.') ?></p>
 
+<div id="ajax-response"></div>
+
 </div>
 
 <div class="wrap">
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;
 }