Changeset 26358

Timestamp:

11/24/2013 04:25:44 PM (11 years ago)

Author:

westi

Message:

Deprecate the second argument for wp_notify_postauthor because it is unecessary. Fixes #17862 props scribu and wonderboymusic.

Location:

trunk/src/wp-includes

Files:

• comment.php (modified) (2 diffs)
• pluggable.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -1415 +1415 @@
 
     if ( 'spam' !== $commentdata['comment_approved'] ) { // If it's spam save it silently for later crunching
-        if ( '0' == $commentdata['comment_approved'] )
-            wp_notify_moderator($comment_ID);
-
-        $post = get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
-
-        if ( get_option('comments_notify') && $commentdata['comment_approved'] && ( ! isset( $commentdata['user_id'] ) || $post->post_author != $commentdata['user_id'] ) )
-            wp_notify_postauthor($comment_ID, isset( $commentdata['comment_type'] ) ? $commentdata['comment_type'] : '' );
+        if ( '0' == $commentdata['comment_approved'] ) {
+            wp_notify_moderator( $comment_ID );
+        }
+
+        if ( get_option('comments_notify') && $commentdata['comment_approved'] ) {
+            $post = get_post( $commentdata['comment_post_ID'] );
+            // Don't notify if it's your own comment
+            if ( ! isset( $commentdata['user_id'] ) || $post->post_author != $commentdata['user_id'] ) {
+                wp_notify_postauthor( $comment_ID );
+            }
+        }
     }
 
@@ -1454 +1458 @@
             $status = '1';
             if ( get_option('comments_notify') ) {
-                $comment = get_comment($comment_id);
-                wp_notify_postauthor($comment_id, $comment->comment_type);
+                wp_notify_postauthor( $comment_id ); 
             }
             break;

trunk/src/wp-includes/pluggable.php

@@ -1006 +1006 @@
  *
  * @param int $comment_id Comment ID
- * @param string $comment_type Optional. The comment type either 'comment' (default), 'trackback', or 'pingback'
+ * @param string $deprecated Not used
  * @return bool False if user email does not exist. True on completion.
  */
-function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
+function wp_notify_postauthor( $comment_id, $deprecated = null ) {
+    if ( null !== $deprecated ) {
+        _deprecated_argument( __FUNCTION__, '3.8' );
+    }
+
     $comment = get_comment( $comment_id );
     if ( empty( $comment ) )
@@ -1039 +1043 @@
     $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-    if ( empty( $comment_type ) ) $comment_type = 'comment';
+    $comment_type = $comment->comment_type ? $comment->comment_type : 'comment'; 
 
     switch ( $comment_type ) {