<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [1692] trunk/bp-core/bp-core-avatars.php:
Added explicit user_id and avatar_dir null value checks to bp_core_fetch_avatar
().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1692</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-25 00:58:09 +0000 (Tue, 25 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added explicit user_id and avatar_dir null value checks to bp_core_fetch_avatar().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (1691 => 1692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2009-08-25 00:44:29 UTC (rev 1691)
+++ trunk/bp-core/bp-core-avatars.php 2009-08-25 00:58:09 UTC (rev 1692)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'object' => 'user', // user OR group OR blog OR custom type (if you use filters)
</span><span class="cx"> 'type' => 'thumb',
</span><del>- 'avatar_dir' => 'avatars',
</del><ins>+ 'avatar_dir' => false,
</ins><span class="cx"> 'width' => false,
</span><span class="cx"> 'height' => false,
</span><span class="cx"> 'class' => 'avatar',
</span><span class="lines">@@ -60,7 +60,22 @@
</span><span class="cx"> $item_id = $current_blog->id;
</span><span class="cx">
</span><span class="cx"> $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object );
</span><ins>+
+ if ( !$item_id ) return false;
</ins><span class="cx"> }
</span><ins>+
+ if ( !$avatar_dir ) {
+ if ( 'user' == $object )
+ $avatar_dir = 'avatars';
+ else if ( 'group' == $object )
+ $avatar_dir = 'group-avatars';
+ else if ( 'blog' == $object )
+ $avatar_dir = 'blog-avatars';
+
+ $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object );
+
+ if ( !$avatar_dir ) return false;
+ }
</ins><span class="cx">
</span><span class="cx"> if ( !$css_id )
</span><span class="cx"> $css_id = $object . '-' . $item_id . '-avatar';
</span></span></pre>
</div>
</div>
</body>
</html>