From 8fe60869c62fc4cdccddbebbf9ea62f46b9c1b58 Mon Sep 17 00:00:00 2001 From: donncha Date: Tue, 18 Jul 2006 14:03:00 +0000 Subject: WP Merge git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@685 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/admin-db.php | 4 +- wp-admin/link-manager.php | 31 +++++++------- wp-includes/wp-db.php | 100 +++++++++++++++++++++++----------------------- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php index 0b8c264..6cd63dd 100644 --- a/wp-admin/admin-db.php +++ b/wp-admin/admin-db.php @@ -271,13 +271,13 @@ function wp_delete_user($id, $reassign = 'novalue') { } // FINALLY, delete user + do_action('delete_user', $id); + $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = $id AND meta_key = '{$wpdb->prefix}capabilities'"); wp_cache_delete($id, 'users'); wp_cache_delete($user->user_login, 'userlogins'); - do_action('delete_user', $id); - return true; } diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 783c938..337e7b5 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -76,21 +76,22 @@ if ( isset($_GET['deleted']) ) {

-

Currently showing - - -links ordered by - +

\n"; +$select_cat .= '\n"; +foreach ((array) $categories as $cat) + $select_cat .= '\n"; +$select_cat .= "\n"; + +$select_order = "\n"; + +printf(__('Currently showing %1$s links ordered by %2$s'), $select_cat, $select_order); +?>

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 142a3ec..37f361a 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -373,59 +373,61 @@ class wpdb { } function bail($message) { // Just wraps errors in a nice header and footer - if ( !$this->show_errors ) - return false; - header( 'Content-Type: text/html; charset=utf-8'); - echo << - - - WordPress › Error - - - - -

WordPress

-HEAD; - echo $message; - echo ""; - die(); + p, li, dt { + line-height: 140%; + padding-bottom: 2px; + } + + ul, ol { + padding: 5px 5px 5px 20px; + } + #logo { + margin-bottom: 2em; + } + --> + + + +

WordPress/>

+

+ + +