WP Merge to rev 4347

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

1 files changed, 5 insertions, 5 deletions

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 71e28fa..afd5c59 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -184,7 +184,7 @@ function wp_login($username, $password, $already_md5 = false) {
 		return false;
 
 	if ( '' == $password ) {
-		$error = __('<strong>Error</strong>: The password field is empty.');
+		$error = __('<strong>ERROR</strong>: The password field is empty.');
 		return false;
 	}
 
@@ -192,7 +192,7 @@ function wp_login($username, $password, $already_md5 = false) {
 	//$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
 
 	if (!$login) {
-		$error = __('<strong>Error</strong>: Wrong username.');
+		$error = __('<strong>ERROR</strong>: Invalid username.');
 		return false;
 	} else {
 		// If the password is already_md5, it has been double hashed.
@@ -200,7 +200,7 @@ function wp_login($username, $password, $already_md5 = false) {
 		if ( ($already_md5 && md5($login->user_pass) == $password) || ($login->user_login == $username && $login->user_pass == md5($password)) ) {
 			return true;
 		} else {
-			$error = __('<strong>Error</strong>: Incorrect password.');
+			$error = __('<strong>ERROR</strong>: Incorrect password.');
 			$pwd = '';
 			return false;
 		}
@@ -343,7 +343,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
 
 	if ('' == $user->user_email) return false; // If there's no email to send the comment to
 
-	$comment_author_domain = gethostbyaddr($comment->comment_author_IP);
+	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 
 	$blogname = get_option('blogname');
 
@@ -421,7 +421,7 @@ function wp_notify_moderator($comment_id) {
 	$comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
 	$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID='$comment->comment_post_ID' LIMIT 1");
 
-	$comment_author_domain = gethostbyaddr($comment->comment_author_IP);
+	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 	$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
 
 	$notify_message  = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";