<!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] [1708] trunk:
Fixing missing slash and adding legacy group and user avatar support to fetch_avatar function
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1708</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-26 17:34:00 +0000 (Wed, 26 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing missing slash and adding legacy group and user avatar support to fetch_avatar function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.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 (1707 => 1708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2009-08-26 17:27:06 UTC (rev 1707)
+++ trunk/bp-core/bp-core-avatars.php 2009-08-26 17:34:00 UTC (rev 1708)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', $bp->root_domain . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
</span><span class="cx"> $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
</span><del>-
</del><ins>+
</ins><span class="cx"> /* If no avatars have been uploaded for this item, display a gravatar */
</span><span class="cx"> if ( !file_exists( $avatar_folder_dir ) && !$no_grav ) {
</span><span class="cx">
</span><span class="lines">@@ -119,29 +119,18 @@
</span><span class="cx">
</span><span class="cx"> /* Set the file names to search for to select the full size or thumbnail image. */
</span><span class="cx"> $avatar_name = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';
</span><ins>+ $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';
+ $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb';
</ins><span class="cx">
</span><span class="cx"> if ( $av_dir = opendir( $avatar_folder_dir ) ) {
</span><span class="cx"> while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
</span><del>- if ( preg_match( "/{$avatar_name}/", $avatar_file ) )
</del><ins>+ if ( preg_match( "/{$avatar_name}/", $avatar_file ) || preg_match( "/{$avatar_name}/", $legacy_user_avatar_file ) || preg_match( "/{$avatar_name}/", $legacy_group_avatar_file ) )
</ins><span class="cx"> $avatar_url = $avatar_folder_url . '/' . $avatar_file;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> closedir($av_dir);
</span><span class="cx">
</span><del>- /* If no avatar is found, check for the legacy file names of '-avatar1' and '-avatar2' */
- if ( !$avatar_url && 'user' == $object ) {
- if ( $av_dir = opendir( $avatar_folder_dir ) ) {
- $avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';
-
- while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
- if ( preg_match( "/{$avatar_name}/", $avatar_file ) )
- $avatar_url = $avatar_folder_url . '/' . $avatar_file;
- }
- }
- closedir($av_dir);
- }
-
- return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$html_width}{$html_height} />", $params );
</del><ins>+ return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_core_delete_existing_avatar( $args = '' ) {
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (1707 => 1708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2009-08-26 17:27:06 UTC (rev 1707)
+++ trunk/bp-groups.php 2009-08-26 17:34:00 UTC (rev 1708)
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx"> $avatar_thumb = str_replace( $bp->root_domain . '/' . basename( WP_CONTENT_DIR ), WP_CONTENT_PATH, $group->avatar_thumb );
</span><span class="cx"> $avatar_full = str_replace( $bp->root_domain . '/' . basename( WP_CONTENT_DIR ), WP_CONTENT_PATH, $group->avatar_full );
</span><span class="cx">
</span><del>- copy( $avatar_thumb, $upload_dir['path'] . basename($avatar_thumb) );
- copy( $avatar_full, $upload_dir['path'] . basename($avatar_full) );
</del><ins>+ copy( $avatar_thumb, $upload_dir['path'] . '/' . basename($avatar_thumb) );
+ copy( $avatar_full, $upload_dir['path'] . '/' . basename($avatar_full) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( function_exists('bp_wire_install') )
</span></span></pre>
</div>
</div>
</body>
</html>