Changeset 1733

Timestamp:

10/04/2004 07:44:04 AM (22 years ago)

Author:

saxmatt

Message:

Use mb_mail_send if available.

Location:

trunk

Files:

• wp-admin/users.php (modified) (1 diff)
• wp-includes/functions.php (modified) (3 diffs)
• wp-login.php (modified) (2 diffs)
• wp-register.php (modified) (1 diff)

trunk/wp-admin/users.php

@@ -96 +96 @@
         $message .= "Login: $user_login\r\n\r\nE-mail: $user_email";
 
-        @mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
+        @wp_mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
         header('Location: users.php');
 break;

trunk/wp-includes/functions.php

@@ -1004 +1004 @@
                 . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
 
-        @mail($user->user_email, $subject, $notify_message, $message_headers);
+        @wp_mail($user->user_email, $subject, $notify_message, $message_headers);
    
     return true;
@@ -1047 +1047 @@
         . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n";
 
-    @mail($admin_email, $subject, $notify_message, $message_headers);
+    @wp_mail($admin_email, $subject, $notify_message, $message_headers);
     
     return true;
@@ -1797 +1797 @@
 }
 
+
+function wp_mail($to, $subject, $message, $headers = '', $more = '') {
+        if ( function_exists('mb_send_mail') )
+                return mb_send_mail($to, $subject, $message, $headers, $more);
+        else
+                return mail($to, $subject, $message, $headers, $more);
+}
+
 ?>

trunk/wp-login.php

@@ -149 +149 @@
         $message .= get_settings('siteurl') . '/wp-login.php';
 
-        $m = mail($user_email, sprintf(__("[%s] Your login and password"), get_settings('blogname')), $message);
+        $m = wp_mail($user_email, sprintf(__("[%s] Your login and password"), get_settings('blogname')), $message);
 
         if ($m == false) {
@@ -159 +159 @@
         echo  "<a href='wp-login.php' title='" . __('Check your e-mail first, of course') . "'>" . __('Click here to login!') . '</a></p>';
                 // send a copy of password change notification to the admin
-                mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
+                wp_mail(get_settings('admin_email'), sprintf(__('[%s] Password Lost/Change'), get_settings('blogname')), sprintf(__('Password Lost and Changed for user: %s'), $user_login));
                 die();
         }

trunk/wp-register.php

@@ -104 +104 @@
         $message  = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email);
 
-        @mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
+        @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message);
 
         ?>