Changeset 6741

Timestamp:

11/17/2017 08:51:34 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Anonymous: remove escaped placeholders from $where clause of duplicate check.

This change fixes a bug for versions of WordPress 4.8.3 and higher, that was causing the anonymous email comparison to use the placeholder text instead of the raw email address, but only when an email address contained a % character.

Also use the correct return variant, and make sure the output is escaped.

Location:

trunk/src/includes

Files:

• common/functions.php (modified) (2 diffs)
• users/template.php (modified) (3 diffs)

trunk/src/includes/common/functions.php

@@ -649 +649 @@
             // Set clauses
             $join  = $clauses['join'];
-            $where = $clauses['where'];
+
+            // "%" and "$" are valid characters
+            $where = $bbp_db->remove_placeholder_escape( $clauses['where'] );
         }
     }
@@ -660 +662 @@
 
     // Prepare duplicate check query
-    $query  = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} {$join} WHERE post_type = %s AND post_status != %s AND post_author = %d AND post_content = %s {$where}", $r['post_type'], $r['post_status'], $r['post_author'], $r['post_content'] );
-    $query .= ! empty( $r['post_parent'] ) ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
+    $query  = "SELECT ID FROM {$bbp_db->posts} {$join}";
+    $query  = $bbp_db->prepare( "WHERE post_type = %s AND post_status != %s AND post_author = %d AND post_content = %s", $r['post_type'], $r['post_status'], $r['post_author'], $r['post_content'] );
+    $query .= ! empty( $r['post_parent'] )
+        ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] )
+        : '';
+    $query .= $where;
     $query .= " LIMIT 1";
     $dupe   = apply_filters( 'bbp_check_for_duplicate_query', $query, $r );

trunk/src/includes/users/template.php

@@ -815 +815 @@
  */
 function bbp_author_display_name( $post_id = 0 ) {
-    echo bbp_get_author_display_name( $post_id );
+    echo esc_attr( bbp_get_author_display_name( $post_id ) );
 }
 
@@ -865 +865 @@
  */
 function bbp_author_email( $post_id = 0 ) {
-    echo bbp_get_author_email( $post_id );
+    echo esc_attr( bbp_get_author_email( $post_id ) );
 }
 
@@ -896 +896 @@
         // Not an edit, so rely on current user cookie data
         } else {
-            $retval = bbp_current_anonymous_user_data( 'email' );
+            $retval = bbp_get_current_anonymous_user_data( 'email' );
         }