Ticket #2053: mailfrom.patch

wp-includes/pluggable-functions.php

@@ -112 +112 @@
-}
-endif;
-
+if ( !function_exists('wp_default_mailfrom') ) :
+function wp_default_mailfrom() {
+        return get_settings('admin_email');
+}
+endif;
+
-if ( !function_exists('wp_mail') ) :
-function wp_mail($to, $subject, $message, $headers = '') {
-        if( $headers == '' ) {
-                $headers = "MIME-Version: 1.0\n" .
-wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])
+" . wp_default_mailfrom(
-                        "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\n";
-        }
-
@@ -280 +286 @@
-        $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-        $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_settings('siteurl').'/wp-admin/post.php?action=confirmdeletecomment&p='.$comment->comment_post_ID."&comment=$comment_id" ) . "\r\n";
-
-'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])
+wp_default_mailfrom(
-
-        if ( '' == $comment->comment_author ) {
-                $from = "From: \"$blogname\" <$wp_email>";

wp-content/plugins/wp-db-backup.php

@@ -639 +639 @@
-                        $data = chunk_split(base64_encode($file));
-                        $headers = "MIME-Version: 1.0\n";
-                        $headers .= "Content-Type: multipart/mixed; boundary=\"$boundary\"\n";
-get_settings('admin_email'
+wp_default_mailfrom(
-                
-                        $message = sprintf(__("Attached to this email is\n   %1s\n   Size:%2s kilobytes\n"), $filename, round(filesize($diskfile)/1024));
-                        // Add a multipart boundary above the plain message

wp-admin/install.php

@@ -182 +182 @@
-$admin_caps = serialize(array('administrator' => true));
-$wpdb->query("INSERT INTO $wpdb->usermeta (user_id, meta_key, meta_value) VALUES ({$wpdb->insert_id}, '{$table_prefix}capabilities', '{$admin_caps}');");
-
-wordpress@' . $_SERVER['SERVER_NAME']
+' . wp_default_mailfrom()
-$message = sprintf(__("Your new WordPress blog has been successfully set up at:
-
-%1\$s