Changeset 6778

Timestamp:

02/08/2013 09:33:37 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Update bp_forums_reply_exists() to use external helper filter instead of escaped create_function() usage. Fixes #4758.

File:

• trunk/bp-forums/bp-forums-functions.php (modified) (2 diffs)

trunk/bp-forums/bp-forums-functions.php

@@ -353 +353 @@
  */
 function bp_forums_reply_exists( $text = '', $topic_id = 0, $user_id = 0 ) {
-    global $wpdb;
 
     $reply_exists = false;
@@ -365 +364 @@
         );
 
+        // Set the reply_exists_text so we can check it in the filter below
+        buddypress()->forums->reply_exists_text = $text;
+
         // BB_Query's post_text parameter does a MATCH, while we need exact matches
-        add_filter( 'get_posts_where', create_function( '$q', 'return $q . " AND p.post_text = \'' . $wpdb->escape( $text ) . '\'";' ) );
-
+        add_filter( 'get_posts_where', '_bp_forums_reply_exists_posts_where' );
         $query = new BB_Query( 'post', $args );
-
-        $reply_exists = !empty( $query->results );
-    }
-
-    return apply_filters( 'bp_forums_reply_exists', $reply_exists, $text, $topic_id, $user_id );
-}
+        remove_filter( 'get_posts_where', '_bp_forums_reply_exists_posts_where' );
+
+        // Cleanup
+        unset( buddypress()->forums->reply_exists_text );
+
+        $reply_exists = (bool) !empty( $query->results );
+    }
+
+    return (bool) apply_filters( 'bp_forums_reply_exists', $reply_exists, $text, $topic_id, $user_id );
+}
+    /**
+     * Private one-time-use function used in conjunction with bp_forums_reply_exists()
+     *
+     * @since BuddyPress (1.7)
+     * @access private
+     * @global WPDB $wpdb
+     * @param string $where
+     * @return string
+     */
+    function _bp_forums_reply_exists_posts_where( $where = '' ) {
+        return $where . " AND p.post_text = '" . buddypress()->forums->reply_exists_text . "'";
+    }
 
 /**