<!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] [2124] branches/1.1/bp-core/bp-core-avatars.php: Fixes #1184</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2124</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2009-11-25 12:34:55 +0000 (Wed, 25 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1184</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches11bpcorebpcoreavatarsphp">branches/1.1/bp-core/bp-core-avatars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches11bpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-core/bp-core-avatars.php (2123 => 2124)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-core/bp-core-avatars.php 2009-11-25 11:56:18 UTC (rev 2123)
+++ branches/1.1/bp-core/bp-core-avatars.php 2009-11-25 12:34:55 UTC (rev 2124)
</span><span class="lines">@@ -221,12 +221,12 @@
</span><span class="cx"> require_once( ABSPATH . '/wp-admin/includes/file.php' );
</span><span class="cx">
</span><span class="cx"> $uploadErrors = array(
</span><del>- 0 => __("There is no error, the file uploaded with success", 'buddypress'),
- 1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
- 2 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
- 3 => __("The uploaded file was only partially uploaded", 'buddypress'),
- 4 => __("No file was uploaded", 'buddypress'),
- 6 => __("Missing a temporary folder", 'buddypress')
</del><ins>+ 0 => __("There is no error, the file uploaded with success", 'buddypress'),
+ 1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
+ 2 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
+ 3 => __("The uploaded file was only partially uploaded", 'buddypress'),
+ 4 => __("No file was uploaded", 'buddypress'),
+ 6 => __("Missing a temporary folder", 'buddypress')
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( !bp_core_check_avatar_upload( $file ) ) {
</span><span class="lines">@@ -270,6 +270,12 @@
</span><span class="cx"> @unlink( $bp->avatar_admin->original['file'] );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Check for WP_Error on what should be an image */
+ if ( is_wp_error( $bp->avatar_admin->image->dir ) ) {
+ bp_core_add_message( sprintf( __( 'Upload failed! Error was: %s', 'buddypress' ), $bp->avatar_admin->image->dir->get_error_message() ), 'error' );
+ return false;
+ }
+
</ins><span class="cx"> /* Set the url value for the image */
</span><span class="cx"> $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $bp->avatar_admin->image->dir );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>