<!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][10721] trunk/src: Introduce 'mystery group' avatar for groups without custom avatar.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10721">10721</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10721","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-27 15:59:26 +0000 (Wed, 27 Apr 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Introduce 'mystery group' avatar for groups without custom avatar.
This nifty new image is totally grouperiffic, and it's gonna supercharge
your BuddyPress community, to the extreme.
As part of the improvement, Gravatar requests for group avatars have been
disabled by default. Gravatar requests never match for groups, anyway, so
this should save HTTP requests in most cases. Filter 'bp_core_fetch_avatar_no_grav'
to restore the previous behavior.
Props sooskriszta, abweb.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6372">#6372</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfiltersphp">trunk/src/bp-groups/bp-groups-filters.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreimagesmysterygroup50png">trunk/src/bp-core/images/mystery-group-50.png</a></li>
<li><a href="#trunksrcbpcoreimagesmysterygrouppng">trunk/src/bp-core/images/mystery-group.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-avatars.php 2016-04-27 15:21:25 UTC (rev 10720)
+++ trunk/src/bp-core/bp-core-avatars.php 2016-04-27 15:59:26 UTC (rev 10721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * local avatar. In some cases, this may be undesirable, in which
</span><span class="cx" style="display: block; padding: 0 10px"> * case 'no_grav' should be set to true. To disable Gravatar
</span><span class="cx" style="display: block; padding: 0 10px"> * fallbacks globally, see the 'bp_core_fetch_avatar_no_grav' filter.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default: false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default: true for groups, otherwise false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $html Whether to return an <img> HTML element, vs a raw URL
</span><span class="cx" style="display: block; padding: 0 10px"> * to an avatar. If false, <img>-specific arguments (like 'css_id')
</span><span class="cx" style="display: block; padding: 0 10px"> * will be ignored. Default: true.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'css_id' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'alt' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'no_grav' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'no_grav' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'html' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'extra_attr' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,6 +564,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // By default, Gravatar is not pinged for groups.
+ if ( null === $params['no_grav'] ) {
+ $params['no_grav'] = 'group' === $params['object'];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether or not to skip Gravatar check.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -671,7 +676,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Default avatar for non-gravatar requests.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $params Array of parameters for the avatar request.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gravatar = apply_filters( 'bp_core_default_avatar_' . $params['object'], bp_core_avatar_default( 'local' ), $params );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gravatar = apply_filters( 'bp_core_default_avatar_' . $params['object'], bp_core_avatar_default( 'local', $params ), $params );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $params['html'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1845,13 +1850,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the URL of the 'full' default avatar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.6.0 Introduced `$params` and `$object_type` parameters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $type 'local' if the fallback should be the locally-hosted version
- * of the mystery-person, 'gravatar' if the fallback should be
- * Gravatar's version. Default: 'gravatar'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $type 'local' if the fallback should be the locally-hosted version
+ * of the mystery person, 'gravatar' if the fallback should be
+ * Gravatar's version. Default: 'gravatar'.
+ * @param array $params Parameters passed to bp_core_fetch_avatar().
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The URL of the default avatar.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_core_avatar_default( $type = 'gravatar' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_core_avatar_default( $type = 'gravatar', $params = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Local override.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'BP_AVATAR_DEFAULT' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = BP_AVATAR_DEFAULT;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1869,10 +1876,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the URL of the 'full' default avatar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.6.0 Added `$params`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $avatar URL of the default avatar.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $params Params provided to bp_core_fetch_avatar().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_core_avatar_default', $avatar );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_core_avatar_default', $avatar, $params );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1882,13 +1891,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * defined.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.6.0 Introduced `$object_type` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $type 'local' if the fallback should be the locally-hosted version
- * of the mystery-person, 'gravatar' if the fallback should be
- * Gravatar's version. Default: 'gravatar'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $type 'local' if the fallback should be the locally-hosted version
+ * of the mystery person, 'gravatar' if the fallback should be
+ * Gravatar's version. Default: 'gravatar'.
+ * @param array $params Parameters passed to bp_core_fetch_avatar().
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The URL of the default avatar thumb.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_core_avatar_default_thumb( $type = 'gravatar' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_core_avatar_default_thumb( $type = 'gravatar', $params = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Local override.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'BP_AVATAR_DEFAULT_THUMB' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = BP_AVATAR_DEFAULT_THUMB;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1906,10 +1917,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the URL of the 'thumb' default avatar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.6.0 Added `$params`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $avatar URL of the default avatar.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $params Params provided to bp_core_fetch_avatar().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_core_avatar_thumb', $avatar );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_core_avatar_thumb', $avatar, $params );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpcoreimagesmysterygroup50png"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-core/images/mystery-group-50.png</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/images/mystery-group-50.png (rev 0)
+++ trunk/src/bp-core/images/mystery-group-50.png 2016-04-27 15:59:26 UTC (rev 10721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,8 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+\x89PNG
+
+
+IHDR 2 2 ;T\xD7m \xA0IDATH\xC7\xED\x95\xDBzC@\x85\xF3\xFE\xCF5\xC6)\xA2\xA4\xA4i҈ \x9AR%$\x91\xA6\x86\xC1h\xC9'\xF7\xD6\xD5`\xFF{mk|c\xC0<\xADA\x8F\xF4\xC8?q\xA2\xC83\xE0 D2\xDC\xD3\xC9\xDF(\xB03\xA2 \x84u1\xB8\x8E\xC8䂈bvB\xA4#*u\xD7Ad\x89(9\xEC\x928\x8FF.2\xB6 \xAC\xE2+\x90\xE1²\xC3l\xD2H\xA4\xE1Ryḯ:\xA2\xF8y0NJg\x89\xF1\xCBLp\x97\xC4 \xD1\xC80\xC8 \x82ԇh\xE4\xA6 \xA0\x90&W!`\x9E\xEFJ\xE6i\xCF-\x8D\xF8<\xC3ljC\x97]Q\xB1Ky\xF5J\xCD\xF5A\xE7a\xB4 \\xC6%b\xA7&lf\xF4` kވ\x87\x9De\xB8.\xF6\xF5\x95r}2\xB9\x98u\xAD\xBC\x85\xFF\x92]\xBE\x90\xD8m\x8EYɘ@\xC1kv\xBA\x8F\x88\xCB\xD1\xE0\xF1 - ّ\xE8\x90\xE1\xD8\xC5%\xAE\x9A~\xC26\xAA^?q\xD2\xCD`'\xBC\xB4d
+a
+2\xFCu;\xA1CF{\x99/z\x84SX \xD0,#\x8A\xCC]\x9D@ȫz\xDC\xDE
+D\xBFS\xA3:\xC99\xC2{\xA8\xB3>!F\x80uG\xCER沮\xDFM ]&S\x90"\xEC\xCFZc\xF8\xBE2 \xCD\xE3\x84e\xC5J\xCF\x85\xE0w3rʒ\xBF\xC7\xE7ō
+G\xA0턁\xAA֨1\xD7~(\x81\xF5\xB1 !\xFA \xBA#\xDF\xF2\xB0\xC1\xF3 IEND\xAEB`\x82
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcbpcoreimagesmysterygrouppng"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-core/images/mystery-group.png</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/images/mystery-group.png (rev 0)
+++ trunk/src/bp-core/images/mystery-group.png 2016-04-27 15:59:26 UTC (rev 10721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,17 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+\x89PNG
+
+
+IHDR \x80 \x80 \xE6U> \xC6IDATx\xDA\xED\x9A\xD9z\xA20\x80\xFB\xFE\xCF \x88u\xADVǭ\xADU\x97\xAA([2uZ5\x84$ĺ\xF4&\xE7\xAA\xFD '\xCE \xF4\xA1\xF0\xCB\xF2\xA0 \x80P
+@( \xA0 \x80P
+@\\xF68\xD8\xCBo\x80\x82aUj\xB5j\xB9\xC0l\x8C\xE6\x9B0\x8A\xA2݇7\xA8\xC0{X\xDDE\x84OL\x9F\xF4{\xC0\xA7E\x82\xD3O+\xF70F\xDB\xFE\x83\xFCgx' {B \xFFK\xA2\xA1q \xDBc\xEF\xFF\xE9\x86\xFD \xC5 \xE2\xEC\x8Fp\xFCG\xBB9 \xF2ο\x97]\xF3\xE6 \xF5 \xC9Һ1\x80\xE9 \xF7\xC7I\xFF\xC6 \xCDH\xB8?\xC2k\xFB\xA6 p"6 BI\xE7\xA6 \xA5
+\xCEW\xBF! h%\xB9 ~ \\x80\xDD\xE7_r\xF7\xC7q \xB0\xA6\x86\xF3 ,:e\xC7\xD2 \xD4s\xDA4 \xE8\xB1\xC1,\x95\xCB%\xA3 \xE4\xAC\x8E\xBB\xC2`\xFD\xB7\xE7\xA4+\x9B\xF9!J\x80\xEF0|I=\xA2\xD7ߖ\xDB0\xDC.^k:\x90л\xAB\x83\xA7\x91?$ \xB0\xFDT<\xFE\x85\xB8 U\xA1[\x95\xB0&1y\xAE9\xD1\xE6Aɗp \xBB\xA9\xBA\xB9\xEB\xC0| {F\xE9[\xDC\xE6J\xE0\xF5\xB4\xFF\x80*[q_\xCB0\xD2)\xBD\xAC\xD3\xF9A\xA8u\xE3\xCC\xC8\xD0\xCE\xD0z\x8CD\x9F\x9C \xF7&\x91\x86\x8D\xEFX\x8F[F\x95p\xC4 \xCB\xC9\xD1Ae<\x9DQ\x88\xD8e\xFBM\xF4\x99v=\x9A ?
+\xF6\xBEK1(\xAC[G`\xCCs\xAA\xABvF3\xEA1\x83:@ ధ\x8D\xA4 \xCEo\xC7\xD0e/y\xD7\xF8 \xA0 \xB3\xD5\xF6\x8F \x86\x8B\x84 \xA7\x81\xC4X\xB2\x97, \xC03;\xC6\xD0 Ȏds\x8B\xAE\x9A4\xF0R\xD0\xE69\xA0
+\xC4w\xC0\xB6~\xD4eqF!@\x95\xEDa\xD4%ǜ\xF2"b,\xD7\xECE3]\x846;ˢ*\xB9\xB6˳A\xEAb\xA2\xBD綊, d\xF7\xFBU1\x8D\xF9i\x94N\xBE\xFF\xF6SW3\xCE\xF47Ei\xC8yhD_\x8E^ì
+\xFArj\xADY\xBA>\x8A\xC2Jh\xB2*\x91\xEF\x80\xEC\xF5\x9C&H\xDE+t\xA7\xEB3N\x93ts\xBAa#\xCC\xE4N\xF2'\xD3\xC45{D+Z\x99i\xB8\xC8C\xCF\xCC\xD0\xFAt-BcZ\xB3V m2 \x85\xB36\xAD\xBC\x9A\xC9\xC4u9w \x81\x83\xB4n4\xA1\x9CV(\xBF\xF8\x889 D\xB3g\xEAA\x8D"X\xD7$F2\xF8\xBC&\xB4\xEF\x94N\xA3\xBB\xE1\xE3أƾG\x8F8N\xEC\x96efB\xA0wN\xE5\x8D\x8Ct :\xD3X\xD8 \xFC\xAE\x9E\xC9 \x899z\xE9\xC8 \xA5zcG \xBD&Y\\xEAK\x84r\xA27\xC2e\xCEhCk\xB2\xEAٹ ΄\xAEƑ{\x9C\x8B\xB5\xD6V<\xFE\xFF\xCC=\xECb\xF4|ja\xB2zօ Z\x8BU<\xFC\xEFivvC1F\xBF\xA6X\xC7eԁxl `\x8F\xE2\xE1\x9E[kXJ\x90\xB7'\xA8rF\xF8\x
99\xC3\xA03\x900ݾ\xCB<m1\x96%\xB0@\x8D{\x91_8 \xAD\xC7\xF0d\xA8U|,
+\x80Ƶ5\xFF\xE3\x85
+\x98 O\xA1@gԟay \xAD5\xD5Y \xB6\xF8\xDA'\x9F\x83 |\x93\xD5c \xC0q\x9EY\xD1\xFB\xE7\xAC\xDDV\xB2 \x8D\xE8\xB2S\x9D\xB3?\xE9\x84\x80\xEE]A\xAD\xFC\xCA\xD3m\xEF\xE1p#\x88\xAE \xB3p
+\xD3 \xBC \xF2g kv\x8F P\xDA\xE2\xEBH-\xEB\xA7,\xC0\xBB\xD1\xE9\xC3I\x8AL
+`\xAE\x93 \xDA\xF8zG\x934TP\x80\xB9\xBC\xA2\xEADnU\x9B N\x909 \xFA)\xC0~\x91\x84\xAE\xC3e\xE3 \xA0\x91\x9Ck\xC4u\x8Fl\xA8\xBA\x90 h\xA3\xFB\xCC
+`%\x90\x9DȖH\xE8\xA7d\xCDW;5\xC9,\xD02F\x99\x8Dd\x8FT!W-\x94\xFD\xBE\xE0\xEB\xC5\xD5\xCF \x92V\xEEw\xF9 \xF6Fأů\x8C\x97c*!\xFE\xB9\xB8\xF0r\x80jt\x80w\x80\xBA \xE0ü<Z\xAB \xC4+^ L\xD1<\x81\x97\xA1\xFA \x91P
+@( \xA0 \x80P
+@(\x80[\xCB?%iY\xA7\xE0\xE1\xD2 IEND\xAEB`\x82
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-filters.php 2016-04-27 15:21:25 UTC (rev 10720)
+++ trunk/src/bp-groups/bp-groups-filters.php 2016-04-27 15:59:26 UTC (rev 10721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +73,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Activity component integration.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_activity_at_name_do_notifications', 'bp_groups_disable_at_mention_notification_for_non_public_groups', 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Default group avatar.
+add_filter( 'bp_core_avatar_default', 'bp_groups_default_avatar', 10, 3 );
+add_filter( 'bp_core_avatar_default_thumb', 'bp_groups_default_avatar', 10, 3 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter output of Group Description through WordPress's KSES API.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,3 +323,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $send;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Use the mystery group avatar for groups.
+ *
+ * @since 2.6.0
+ *
+ * @param string $avatar Current avatar src.
+ * @param array $params Avatar params.
+ * @return string
+ */
+function bp_groups_default_avatar( $avatar, $params ) {
+ if ( isset( $params['object'] ) && 'group' === $params['object'] ) {
+ if ( isset( $params['type'] ) && 'thumb' === $params['type'] ) {
+ $file = 'mystery-group-50.png';
+ } else {
+ $file = 'mystery-group.png';
+ }
+
+ $avatar = buddypress()->plugin_url . "bp-core/images/$file";
+ }
+
+ return $avatar;
+}
</ins></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2016-04-27 15:21:25 UTC (rev 10720)
+++ trunk/src/bp-groups/bp-groups-template.php 2016-04-27 15:59:26 UTC (rev 10721)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'css_id' => $r['id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => $r['class'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => $r['width'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'height' => $r['height']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => $r['height'],
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If No avatar found, provide some backwards compatibility.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4705,7 +4705,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'avatar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'avatar-crop-preview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'alt' => __( 'Group photo', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'no_grav' => false
</del><span class="cx" style="display: block; padding: 0 10px"> ), 'get_new_group_avatar' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Merge parsed arguments with object specific data.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5148,14 +5147,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $group_id = bp_get_current_group_id();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $group_avatar = bp_core_fetch_avatar( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'item_id' => $group_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_grav' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'html' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => 'thumb',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_core_avatar_default( 'local' ) === $group_avatar ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_avatar = bp_core_fetch_avatar( $avatar_args );
+
+ if ( bp_core_avatar_default( 'local', $avatar_args ) === $group_avatar ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>