<!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] [2729] trunk/bp-core/bp-core-avatars.php:
More whitespace and formatting fixes</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2729</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-02-16 04:40:58 +0000 (Tue, 16 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More whitespace and formatting fixes</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 (2728 => 2729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2010-02-16 03:40:37 UTC (rev 2728)
+++ trunk/bp-core/bp-core-avatars.php 2010-02-16 04:40:58 UTC (rev 2729)
</span><span class="lines">@@ -208,12 +208,12 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( $av_dir = opendir( $avatar_folder_dir ) ) {
</span><del>- while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
</del><ins>+ while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
</ins><span class="cx"> if ( ( preg_match( "/-bpfull/", $avatar_file ) || preg_match( "/-bpthumb/", $avatar_file ) ) && '.' != $avatar_file && '..' != $avatar_file )
</span><span class="cx"> @unlink( $avatar_folder_dir . '/' . $avatar_file );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- closedir($av_dir);
</del><ins>+ closedir($av_dir);
</ins><span class="cx">
</span><span class="cx"> @rmdir( $avatar_folder_dir );
</span><span class="cx">
</span><span class="lines">@@ -229,12 +229,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">@@ -252,25 +252,24 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Filter the upload location
</del><ins>+ /* Filter the upload location */
</ins><span class="cx"> add_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
</span><span class="cx">
</span><span class="cx"> $bp->avatar_admin->original = wp_handle_upload( $file['file'], array( 'action'=> 'bp_avatar_upload' ) );
</span><span class="cx">
</span><del>- // Move the file to the correct upload location.
</del><ins>+ /* Move the file to the correct upload location. */
</ins><span class="cx"> if ( !empty( $bp->avatar_admin->original['error'] ) ) {
</span><span class="cx"> bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $bp->avatar_admin->original['error'] ), 'error' );
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Resize the image down to something manageable and then delete the original
- if ( getimagesize( $bp->avatar_admin->original['file'] ) > BP_AVATAR_ORIGINAL_MAX_WIDTH ) {
</del><ins>+ /* Resize the image down to something manageable and then delete the original */
+ if ( getimagesize( $bp->avatar_admin->original['file'] ) > BP_AVATAR_ORIGINAL_MAX_WIDTH )
</ins><span class="cx"> $bp->avatar_admin->resized = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $bp->avatar_admin->image = new stdClass;
</span><span class="cx">
</span><del>- // We only want to handle one image after resize.
</del><ins>+ /* We only want to handle one image after resize. */
</ins><span class="cx"> if ( empty( $bp->avatar_admin->resized ) )
</span><span class="cx"> $bp->avatar_admin->image->dir = $bp->avatar_admin->original['file'];
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>