Changeset 25433 for trunk/src/wp-includes/pluggable.php

Timestamp:

09/13/2013 10:17:51 PM (11 years ago)

Author:

wonderboymusic

Message:

Fix some undefined index notices related to Comment unit tests:

• There are several places where a $_POST index was unchecked before setting a variable
• In wp_notify_postauthor(), $comment was being returned null, but its properties were being accessed.
• In check_ajax_referer(), 3 different values can be checked for nonce on $_REQUEST, but only 1 had an isset()

See #25282.

File:

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

trunk/src/wp-includes/pluggable.php

@@ -831 +831 @@
  */
 function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
-    if ( $query_arg )
+    $nonce = '';
+
+    if ( $query_arg && isset( $_REQUEST[$query_arg] ) )
         $nonce = $_REQUEST[$query_arg];
-    else
-        $nonce = isset($_REQUEST['_ajax_nonce']) ? $_REQUEST['_ajax_nonce'] : $_REQUEST['_wpnonce'];
+
+    if ( isset( $_REQUEST['_ajax_nonce'] ) )
+        $nonce = $_REQUEST['_ajax_nonce'];
+
+    if ( isset( $_REQUEST['_wpnonce'] ) )
+        $nonce = $_REQUEST['_wpnonce'];
 
     $result = wp_verify_nonce( $nonce, $action );
@@ -1010 +1016 @@
 function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
     $comment = get_comment( $comment_id );
+    if ( empty( $comment ) )
+        return false;
+
     $post    = get_post( $comment->comment_post_ID );
     $author  = get_userdata( $post->post_author );