Changeset 5700 for trunk/wp-includes/pluggable.php

Timestamp:

06/14/2007 02:25:30 AM (19 years ago)

Author:

ryan

Message:

Trim empty lines. Nothing but newline.

File:

• trunk/wp-includes/pluggable.php (modified) (14 diffs)

trunk/wp-includes/pluggable.php

@@ -160 +160 @@
 function wp_mail( $to, $subject, $message, $headers = '' ) {
     global $phpmailer;
-    
+
     // (Re)create it, if it's gone missing
     if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
@@ -167 +167 @@
         $phpmailer = new PHPMailer();
     }
-    
+
     // Compact the input, apply the filters, and extract them back out
     extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers' ) ) );
-    
+
     // Default headers
     if ( empty( $headers ) ) {
@@ -181 +181 @@
         $tempheaders = (array) explode( "\n", $headers );
         $headers = array();
-        
+
         // If it's actually got contents
         if ( !empty( $tempheaders ) ) {
@@ -188 +188 @@
                 // Explode them out
                 list( $name, $content ) = explode( ':', trim( $header ), 2 );
-                
+
                 // Cleanup crew
                 $name = trim( $name );
                 $content = trim( $content );
-                
+
                 // Mainly for legacy -- process a From: header if it's there
                 if ( $name == 'From' ) {
@@ -200 +200 @@
                         $from_name = str_replace( '"', '', $from_name );
                         $from_name = trim( $from_name );
-                        
+
                         $from_email = substr( $content, strpos( '<', $content ) + 1 );
                         $from_email = str_replace( '>', '', $from_email );
@@ -222 +222 @@
         }
     }
-    
+
     // Empty out the values that may be set
     $phpmailer->ClearAddresses();
@@ -231 +231 @@
     $phpmailer->ClearCustomHeaders();
     $phpmailer->ClearReplyTos();
-    
+
     // From email and name
     // If we don't have a name from the input headers
@@ -237 +237 @@
         $from_name = 'WordPress';
     }
-    
+
     // If we don't have an email from the input headers
     if ( !isset( $from_email ) ) {
@@ -245 +245 @@
             $sitename = substr( $sitename, 4 );
         }
-        
+
         $from_email = 'wordpress@' . $sitename;
     }
-    
+
     // Set the from name and email
     $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
     $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
-    
+
     // Set destination address
     $phpmailer->AddAddress( $to );
-    
+
     // Set mail's subject and body
     $phpmailer->Subject = $subject;
     $phpmailer->Body = $message;
-    
+
     // Set to use PHP's mail()
     $phpmailer->IsMail();
-    
+
     // Set Content-Type and charset
     // If we don't have a content-type from the input headers
@@ -268 +268 @@
         $content_type = 'text/plain';
     }
-    
+
     // Set whether it's plaintext or not, depending on $content_type
     if ( $content_type == 'text/html' ) {
@@ -275 +275 @@
         $phpmailer->IsHTML( false );
     }
-    
+
     // If we don't have a charset from the input headers
     if ( !isset( $charset ) ) {
         $charset = get_bloginfo( 'charset' );
     }
-    
+
     // Set the content-type and charset
     $phpmailer->ContentType = apply_filters( 'wp_mail_content_type', 'text/plain' );
     $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
-    
+
     // Set custom headers
     if ( !empty( $headers ) ) {
@@ -291 +291 @@
         }
     }
-    
+
     do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
-    
+
     // Send!
     $result = @$phpmailer->Send();
-    
+
     return $result;
 }
@@ -534 +534 @@
 
     @wp_mail($user->user_email, $subject, $notify_message, $message_headers);
-   
+
     return true;
 }
@@ -550 +550 @@
     if( get_option( "moderation_notify" ) == 0 )
         return true; 
-    
+
     $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");