<!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][8244] trunk: Allow bp_get_group_has_avatar() to accept a group_id param</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/8244">8244</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-04-06 16:20:35 +0000 (Sun, 06 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow bp_get_group_has_avatar() to accept a group_id param
Also fix some logic that was causing the function to return true when the
group avatar matched the default avatar (meaning that no local avatar had been
uploaded). See <a href="http://buddypress.trac.wordpress.org/changeset/7769">r7769</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5380">#5380</a>
Props imath</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkteststestcasesgroupsavatarsphp">trunk/tests/testcases/groups/avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (8243 => 8244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2014-04-06 16:20:31 UTC (rev 8243)
+++ trunk/bp-groups/bp-groups-template.php 2014-04-06 16:20:35 UTC (rev 8244)
</span><span class="lines">@@ -2900,12 +2900,29 @@
</span><span class="cx"> return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_get_group_has_avatar() {
</del><ins>+function bp_get_group_has_avatar( $group_id = false ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
</del><ins>+ if ( false === $group_id ) {
+ $group_id = bp_get_current_group_id();
+ }
+
+ // Todo - this looks like an overgeneral check
+ if ( ! empty( $_FILES ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ $group_avatar = bp_core_fetch_avatar( array(
+ 'item_id' => $group_id,
+ 'object' => 'group',
+ 'no_grav' => true,
+ 'html' => false,
+ ) );
+
+ if ( bp_core_avatar_default( 'local' ) === $group_avatar ) {
+ return false;
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesgroupsavatarsphp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/groups/avatars.php (0 => 8244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/groups/avatars.php (rev 0)
+++ trunk/tests/testcases/groups/avatars.php 2014-04-06 16:20:35 UTC (rev 8244)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<?php
+
+/**
+ * @group avatars
+ * @group groups
+ */
+class BP_Tests_Groups_Avatars extends BP_UnitTestCase {
+ /**
+ * @group bp_get_group_has_avatar
+ */
+ public function test_bp_get_group_has_avatar_no_avatar_uploaded() {
+ $g = $this->factory->group->create();
+ $this->assertFalse( bp_get_group_has_avatar( $g ) );
+ }
+
+ /**
+ * @group bp_get_group_has_avatar
+ */
+ public function test_bp_get_group_has_avatar_has_avatar_uploaded() {
+ $g = $this->factory->group->create();
+
+ // Fake it
+ add_filter( 'bp_core_fetch_avatar_url', array( $this, 'avatar_cb' ) );
+
+ $this->assertTrue( bp_get_group_has_avatar( $g ) );
+
+ remove_filter( 'bp_core_fetch_avatar_url', array( $this, 'avatar_cb' ) );
+ }
+
+ public function avatar_cb() {
+ return 'foo';
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>