<!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][7574] trunk: Support more liberal params for disabling comments in bp_has_activities()</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/7574">7574</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-11-15 20:57:09 +0000 (Fri, 15 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support more liberal params for disabling comments in bp_has_activities()
The 'display_comments' argument of bp_has_activities() takes either a string
value (such as 'threaded') or a bool false to disable comments altogether.
However, the false check in the query method is strict, meaning that various
analogous null values for display_comments were not recognized. In particular,
the strict check made it impossible to disable activity comments via a
querystring, as is often done in templates: ?display_comments=0.
This changeset adds 0, '0', 'false', and 'none' to the possible values for
the null display_comments value, to support the longtime codex suggestions.
Changes are made at the level of bp_has_activities(), which means that the
query method still requires a string false for $display_comments.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5029">#5029</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkteststestcasesactivitytemplatephp">trunk/tests/testcases/activity/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (7573 => 7574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2013-11-15 20:57:01 UTC (rev 7573)
+++ trunk/bp-activity/bp-activity-template.php 2013-11-15 20:57:09 UTC (rev 7574)
</span><span class="lines">@@ -529,6 +529,13 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><span class="cx">
</span><ins>+ // Translate various values for 'display_comments'
+ // This allows disabling comments via ?display_comments=0
+ // or =none or =false. Final true is a strict type check. See #5029
+ if ( in_array( $display_comments, array( 0, '0', 'none', 'false' ), true ) ) {
+ $display_comments = false;
+ }
+
</ins><span class="cx"> if ( empty( $search_terms ) && ! empty( $_REQUEST['s'] ) )
</span><span class="cx"> $search_terms = $_REQUEST['s'];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/activity/template.php (7573 => 7574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/template.php 2013-11-15 20:57:01 UTC (rev 7573)
+++ trunk/tests/testcases/activity/template.php 2013-11-15 20:57:09 UTC (rev 7574)
</span><span class="lines">@@ -253,33 +253,4 @@
</span><span class="cx"> $this->assertEquals( array( $a1, $a2 ), $ids );
</span><span class="cx">
</span><span class="cx"> }
</span><del>- /**
- * @ticket BP5029
- */
- public function test_get_with_display_comments_false_querystring() {
- $now = time();
- $a1 = $this->factory->activity->create( array(
- 'content' => 'Life Rules',
- 'recorded_time' => date( 'Y-m-d H:i:s', $now ),
- ) );
- $a2 = $this->factory->activity->create( array(
- 'content' => 'Life Drools',
- 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
- ) );
- $a3 = bp_activity_new_comment( array(
- 'activity_id' => $a1,
- 'content' => 'Candy is good',
- 'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
- ) );
-
- $expected = BP_Activity_Activity::get( array(
- 'display_comments' => false,
- ) );
-
- $found = BP_Activity_Activity::get( 'display_comments=false' );
- $this->assertEquals( $expected, $found );
-
- }
-
-
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>