GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-02-09 12:03:45 -05:00
commit 73b8de7c4c
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/showstream.php
View File

@ -248,6 +248,15 @@ class ShowstreamAction extends Action
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
'alt' => $this->profile->nickname)); 'alt' => $this->profile->nickname));
$this->elementEnd('dd'); $this->elementEnd('dd');
$user = User::staticGet('id', $this->profile->id);
$cur = common_current_user();
if ($cur && $cur->id == $user->id) {
$this->elementStart('dd');
$this->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
$this->elementEnd('dd');
}
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->elementStart('dl', 'entity_nickname'); $this->elementStart('dl', 'entity_nickname');
@ -346,7 +355,6 @@ class ShowstreamAction extends Action
$this->elementEnd('li'); $this->elementEnd('li');
} }
$user = User::staticGet('id', $this->profile->id);
if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) { if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
$this->elementStart('li', 'entity_send-a-message'); $this->elementStart('li', 'entity_send-a-message');
$this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)), $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),

22
lib/imagefile.php
View File

@ -112,6 +112,23 @@ class ImageFile
throw new Exception(_('Lost our file.')); throw new Exception(_('Lost our file.'));
return; return;
} }
// Don't crop/scale if it isn't necessary
if ($size === $this->width
&& $size === $this->height
&& $x === 0
&& $y === 0
&& $w === $this->width
&& $h === $this->height) {
$outname = Avatar::filename($this->id,
image_type_to_extension($this->type),
$size,
common_timestamp());
$outpath = Avatar::path($outname);
@copy($this->filepath, $outpath);
return $outname;
}
switch ($this->type) { switch ($this->type) {
case IMAGETYPE_GIF: case IMAGETYPE_GIF:
@ -165,7 +182,7 @@ class ImageFile
imagegif($image_dest, $outpath); imagegif($image_dest, $outpath);
break; break;
case IMAGETYPE_JPEG: case IMAGETYPE_JPEG:
imagejpeg($image_dest, $outpath); imagejpeg($image_dest, $outpath, 100);
break; break;
case IMAGETYPE_PNG: case IMAGETYPE_PNG:
imagepng($image_dest, $outpath); imagepng($image_dest, $outpath);
@ -174,6 +191,9 @@ class ImageFile
throw new Exception(_('Unknown file type')); throw new Exception(_('Unknown file type'));
return; return;
} }
imagedestroy($image_src);
imagedestroy($image_dest);
return $outname; return $outname;
} }