From 6f355ce7785ba6444e9c0480864f5fa6fca25b82 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Sun, 2 Apr 2006 00:48:14 +0000 Subject: [PATCH] Get all error messages with get_error_messages(). git-svn-id: https://develop.svn.wordpress.org/trunk@3679 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/admin-ajax.php | 5 ++--- wp-admin/profile-update.php | 5 ++--- wp-admin/user-edit.php | 5 ++--- wp-admin/users.php | 3 +-- wp-includes/classes.php | 11 ++++++++++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index a3bce779fc..7f7db0b774 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -215,9 +215,8 @@ case 'add-user' : require_once( ABSPATH . WPINC . '/registration-functions.php'); $user_id = add_user(); if ( is_wp_error( $user_id ) ) { - foreach( $user_id->get_error_codes() as $code) - foreach( $user_id->get_error_messages($code) as $message ) - echo "$message
"; + foreach( $user_id->get_error_messages() as $message ) + echo "$message
"; exit; } elseif ( !$user_id ) { die('0'); diff --git a/wp-admin/profile-update.php b/wp-admin/profile-update.php index 47b6d789d8..4a500e2c8b 100644 --- a/wp-admin/profile-update.php +++ b/wp-admin/profile-update.php @@ -10,9 +10,8 @@ if ( !$_POST ) $errors = edit_user($user_ID); if ( is_wp_error( $errors ) ) { - foreach( $errors->get_error_codes() as $code) - foreach( $errors->get_error_messages($code) as $message ) - echo "$message
"; + foreach( $errors->get_error_messages() as $message ) + echo "$message
"; exit; } diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 128da67d3e..615e0cf11e 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -63,9 +63,8 @@ if (!current_user_can('edit_users'))
diff --git a/wp-admin/users.php b/wp-admin/users.php index 200920a0e9..890e7e1002 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -195,8 +195,7 @@ default:
diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 432b25b0c0..08f194cb0c 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -363,7 +363,16 @@ class WP_Error { return $codes[0]; } - function get_error_messages($code) { + function get_error_messages($code = '') { + // Return all messages if no code specified. + if ( empty($code) ) { + $all_messages = array(); + foreach ( $this->errors as $code => $messages ) + $all_messages = array_merge($all_messages, $messages); + + return $all_messages; + } + if ( isset($this->errors[$code]) ) return $this->errors[$code]; else