Changeset 26114

Timestamp:

11/13/2013 02:31:15 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices in wp_notify_postauthor() when using a custom comment type.
Use a switch statement for consistency with wp_notify_moderator().

fixes #25880.

File:

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

trunk/src/wp-includes/pluggable.php

@@ -1044 +1044 @@
     if ( empty( $comment_type ) ) $comment_type = 'comment';
 
-    if ('comment' == $comment_type) {
-        $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
-        /* translators: 1: comment author, 2: author IP, 3: author domain */
-        $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-        $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
-        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
-        $notify_message .= sprintf( __('Whois  : http://whois.arin.net/rest/ip/%s'), $comment->comment_author_IP ) . "\r\n";
-        $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
-        $notify_message .= __('You can see all comments on this post here: ') . "\r\n";
-        /* translators: 1: blog name, 2: post title */
-        $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
-    } elseif ('trackback' == $comment_type) {
-        $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
-        /* translators: 1: website name, 2: author IP, 3: author domain */
-        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
-        $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
-        $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
-        /* translators: 1: blog name, 2: post title */
-        $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
-    } elseif ('pingback' == $comment_type) {
-        $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
-        /* translators: 1: comment author, 2: author IP, 3: author domain */
-        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
-        $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
-        $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
-        /* translators: 1: blog name, 2: post title */
-        $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
+    switch ( $comment_type ) {
+        case 'trackback':
+            $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
+            /* translators: 1: website name, 2: author IP, 3: author domain */
+            $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
+            $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
+            $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
+            /* translators: 1: blog name, 2: post title */
+            $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
+            break;
+        case 'pingback':
+            $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
+            /* translators: 1: comment author, 2: author IP, 3: author domain */
+            $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
+            $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
+            $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
+            /* translators: 1: blog name, 2: post title */
+            $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
+            break;
+        default: // Comments
+            $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
+            /* translators: 1: comment author, 2: author IP, 3: author domain */
+            $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
+            $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
+            $notify_message .= sprintf( __('Whois  : http://whois.arin.net/rest/ip/%s'), $comment->comment_author_IP ) . "\r\n";
+            $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
+            $notify_message .= __('You can see all comments on this post here: ') . "\r\n";
+            /* translators: 1: blog name, 2: post title */
+            $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
+            break;
     }
     $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
@@ -1149 +1153 @@
     $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-    switch ($comment->comment_type)
-    {
+    switch ( $comment->comment_type ) {
         case 'trackback':
             $notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
@@ -1165 +1168 @@
             $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
             break;
-        default: //Comments
+        default: // Comments
             $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
             $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";