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

ImageFile $id argument is only for File objects

Browse Source 
Remember to eliminate the Avatar/group logo call to ImageFile->resize!
This commit is contained in:
Mikael Nordfeldth 2015-03-11 00:20:48 +01:00
parent 6f76c8b59d
commit 2a32af084f
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/avatarsettings.php
View File

@ -374,7 +374,7 @@ class AvatarsettingsAction extends SettingsAction
$user = common_current_user(); $user = common_current_user();
$profile = $user->getProfile(); $profile = $user->getProfile();
$imagefile = new ImageFile($user->id, $filedata['filepath']); $imagefile = new ImageFile(null, $filedata['filepath']);
$filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h); $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
if ($profile->setOriginal($filename)) { if ($profile->setOriginal($filename)) {

2
actions/grouplogo.php
View File

@ -393,7 +393,7 @@ class GrouplogoAction extends GroupAction
$size = min($dest_w, $dest_h); $size = min($dest_w, $dest_h);
$size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size; $size = ($size > MAX_ORIGINAL) ? MAX_ORIGINAL:$size;
$imagefile = new ImageFile($this->group->id, $filedata['filepath']); $imagefile = new ImageFile(null, $filedata['filepath']);
$filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h); $filename = $imagefile->resize($size, $dest_x, $dest_y, $dest_w, $dest_h);
if ($this->group->setOriginal($filename)) { if ($this->group->setOriginal($filename)) {

2
classes/Oauth_application.php
View File

@ -80,7 +80,7 @@ class Oauth_application extends Managed_DataObject
function setOriginal($filename) function setOriginal($filename)
{ {
$imagefile = new ImageFile($this->id, Avatar::path($filename)); $imagefile = new ImageFile(null, Avatar::path($filename));
// XXX: Do we want to have a bunch of different size icons? homepage, stream, mini? // XXX: Do we want to have a bunch of different size icons? homepage, stream, mini?
// or just one and control size via CSS? --Zach // or just one and control size via CSS? --Zach

2
classes/User_group.php
View File

@ -312,7 +312,7 @@ class User_group extends Managed_DataObject
function setOriginal($filename) function setOriginal($filename)
{ {
$imagefile = new ImageFile($this->id, Avatar::path($filename)); $imagefile = new ImageFile(null, Avatar::path($filename));
$orig = clone($this); $orig = clone($this);
$this->original_logo = Avatar::url($filename); $this->original_logo = Avatar::url($filename);

2
plugins/FacebookBridge/actions/facebookfinishlogin.php
View File

@ -436,7 +436,7 @@ class FacebookfinishloginAction extends Action
} else { } else {
// save it as an avatar // save it as an avatar
$file = new ImageFile($user->id, Avatar::path($tmpname)); $file = new ImageFile(null, Avatar::path($tmpname));
$filename = $file->resize(180); // size of the biggest img we get from Facebook $filename = $file->resize(180); // size of the biggest img we get from Facebook
$profile = $user->getProfile(); $profile = $user->getProfile();

3
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -1268,8 +1268,7 @@ class Ostatus_profile extends Managed_DataObject
} else { } else {
$id = $this->profile_id; $id = $this->profile_id;
} }
// @todo FIXME: Should we be using different ids? $imagefile = new ImageFile(null, $temp_filename);
$imagefile = new ImageFile($id, $temp_filename);
$filename = Avatar::filename($id, $filename = Avatar::filename($id,
image_type_to_extension($imagefile->type), image_type_to_extension($imagefile->type),
null, null,

4
plugins/WikiHowProfile/WikiHowProfilePlugin.php
View File

@ -188,9 +188,7 @@ class WikiHowProfilePlugin extends Plugin
$profile = $user->getProfile(); $profile = $user->getProfile();
$id = $profile->id; $id = $profile->id;
// @fixme should we be using different ids? $imagefile = new ImageFile(null, $temp_filename);
$imagefile = new ImageFile($id, $temp_filename);
$filename = Avatar::filename($id, $filename = Avatar::filename($id,
image_type_to_extension($imagefile->type), image_type_to_extension($imagefile->type),
null, null,