summaryrefslogtreecommitdiffstats
path: root/wp-admin
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-11-24 17:04:14 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-11-24 17:04:14 +0000
commitf3f3886b6ce0f9cdf2a663c450a1ddb8593bd799 (patch)
treee4ec667aae78a662485b750905182bf3d39c19ad /wp-admin
parent23f67568a169dd05954b92d198923850709baae3 (diff)
WP Merge with revision 9860
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1542 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin')
-rw-r--r--wp-admin/css/press-this-ie.css14
-rw-r--r--wp-admin/users.php1
2 files changed, 8 insertions, 7 deletions
diff --git a/wp-admin/css/press-this-ie.css b/wp-admin/css/press-this-ie.css
index 2e2282a..e9667c1 100644
--- a/wp-admin/css/press-this-ie.css
+++ b/wp-admin/css/press-this-ie.css
@@ -1,7 +1,7 @@
-#posting {
- position: static !important;
-}
- .ui-tabs-nav {
- margin-left: 0;
- border: 0 !important;
-}
+#posting {
+ position: static !important;
+}
+ .ui-tabs-nav {
+ margin-left: 0;
+ border: 0 !important;
+}
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 0321cce..2fff69f 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -128,6 +128,7 @@ case 'delete':
<?php
$go_delete = false;
foreach ( (array) $userids as $id ) {
+ $id = (int) $id;
$user = new WP_User($id);
if ( $id == $current_user->ID ) {
echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";