<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][6778] trunk/bp-forums/bp-forums-functions.php: Update bp_forums_reply_exists() to use external helper filter instead of escaped create_function() usage.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6778">6778</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-02-08 09:33:37 +0000 (Fri, 08 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update bp_forums_reply_exists() to use external helper filter instead of escaped create_function() usage. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4758">#4758</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsfunctionsphp">trunk/bp-forums/bp-forums-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-functions.php (6777 => 6778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-functions.php 2013-02-08 07:45:50 UTC (rev 6777)
+++ trunk/bp-forums/bp-forums-functions.php 2013-02-08 09:33:37 UTC (rev 6778)
</span><span class="lines">@@ -352,7 +352,6 @@
</span><span class="cx"> * @param int $user_id The user id
</span><span class="cx"> */
</span><span class="cx"> function bp_forums_reply_exists( $text = '', $topic_id = 0, $user_id = 0 ) {
</span><del>- global $wpdb;
</del><span class="cx">
</span><span class="cx"> $reply_exists = false;
</span><span class="cx">
</span><span class="lines">@@ -364,16 +363,34 @@
</span><span class="cx"> 'topic_id' => $topic_id
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ // Set the reply_exists_text so we can check it in the filter below
+ buddypress()->forums->reply_exists_text = $text;
+
</ins><span class="cx"> // BB_Query's post_text parameter does a MATCH, while we need exact matches
</span><del>- add_filter( 'get_posts_where', create_function( '$q', 'return $q . " AND p.post_text = \'' . $wpdb->escape( $text ) . '\'";' ) );
-
</del><ins>+ add_filter( 'get_posts_where', '_bp_forums_reply_exists_posts_where' );
</ins><span class="cx"> $query = new BB_Query( 'post', $args );
</span><ins>+ remove_filter( 'get_posts_where', '_bp_forums_reply_exists_posts_where' );
</ins><span class="cx">
</span><del>- $reply_exists = !empty( $query->results );
</del><ins>+ // Cleanup
+ unset( buddypress()->forums->reply_exists_text );
+
+ $reply_exists = (bool) !empty( $query->results );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'bp_forums_reply_exists', $reply_exists, $text, $topic_id, $user_id );
</del><ins>+ return (bool) apply_filters( 'bp_forums_reply_exists', $reply_exists, $text, $topic_id, $user_id );
</ins><span class="cx"> }
</span><ins>+ /**
+ * 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 . "'";
+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Get a total "Topics Started" count for a given user
</span></span></pre>
</div>
</div>
</body>
</html>