diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index c5d48b94a..67fe5a997 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -147,7 +147,7 @@ case 'add-cat' : // From Manage->Categories 'what' => 'cat', 'id' => $cat->cat_ID, 'data' => _cat_row( $cat, $level, $cat_full_name ), - 'supplemental' => array('name' => $cat_full_name) + 'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category %s added' ), "cat-$cat->cat_ID", $cat_full_name)) ) ); $x->send(); break; @@ -211,10 +211,12 @@ case 'add-user' : echo "

$message

"; exit; } + $user_object = new WP_User( $user_id ); $x = new WP_Ajax_Response( array( 'what' => 'user', 'id' => $user_id, - 'data' => user_row( $user_id ) + 'data' => user_row( $user_object ), + 'supplemental' => array('show-link' => sprintf(__( 'User %s added' ), "user-$user_id", $user_object->user_login)) ) ); $x->send(); break; diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 747551e2c..659a6ba3f 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -814,11 +814,13 @@ function user_row( $user_object, $style = '' ) { if ( $numposts > 0 ) { $r .= ""; $r .= sprintf( __('View %1$s %2$s' ), $numposts, __ngettext( 'post', 'posts', $numposts )); + $r .= ''; } $r .= "\n\t\t"; - $edit_link = add_query_arg( 'wp_http_referer', wp_specialchars( urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ); - if ( current_user_can( 'edit_user', $user_object->ID ) ) + if ( current_user_can( 'edit_user', $user_object->ID ) ) { + $edit_link = wp_specialchars( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), "user-edit.php?user_id=$user_object->ID" ) ); $r .= "".__( 'Edit' ).""; + } $r .= "\n\t"; return $r; } diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php index b029856f6..f4992ea48 100644 --- a/wp-admin/edit-category-form.php +++ b/wp-admin/edit-category-form.php @@ -16,6 +16,7 @@ if ( ! empty($cat_ID) ) {

+
@@ -41,7 +42,6 @@ if ( ! empty($cat_ID) ) {

-
diff --git a/wp-admin/users.js b/wp-admin/users.js index 5e4041896..f249f65fa 100644 --- a/wp-admin/users.js +++ b/wp-admin/users.js @@ -2,7 +2,8 @@ addLoadEvent(function() { theListEls = document.getElementsByTagName('tbody'); theUserLists = new Array(); for ( var l = 0; l < theListEls.length; l++ ) { - theUserLists[theListEls[l].id] = new listMan(theListEls[l].id); + if ( theListEls[l].id ) + theUserLists[theListEls[l].id] = new listMan(theListEls[l].id); } addUserInputs = document.getElementById('adduser').getElementsByTagName('input'); for ( var i = 0; i < addUserInputs.length; i++ ) { diff --git a/wp-admin/users.php b/wp-admin/users.php index c3f4ab01d..a0d876c46 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -376,7 +376,7 @@ default: foreach($roleclasses as $role => $roleclass) { uksort($roleclass, "strnatcasecmp"); ?> - +

role_names[$role]; ?>

@@ -392,7 +392,7 @@ foreach($roleclasses as $role => $roleclass) { - +

+ + +
+ get_error_messages() as $message ) + echo "

$message

"; + ?> +
+ +
+
+ '.sprintf(__('Users can register themselves or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'

'; ?>
@@ -488,18 +500,9 @@ foreach ( (array) $roleclass as $user_object ) {

-
- -
- get_error_messages() as $message ) - echo "

$message

"; - ?> -
- -
+ \n"; + $output = "