summaryrefslogtreecommitdiff
path: root/actions/finishremotesubscribe.php
diff options
context:
space:
mode:
authorSean Murphy <sgmurphy@gmail.com>2009-02-09 20:18:27 -0500
committerSean Murphy <sgmurphy@gmail.com>2009-02-09 20:18:27 -0500
commitd8ed013612aa974753e25b933cf379fa76002c64 (patch)
tree09f77c2539e4375310dd0ee0475197bf9d29a6e6 /actions/finishremotesubscribe.php
parent55fcc150fe90156ad33f8627128c7ae555662528 (diff)
parent47a5d2b7f06cd1612734c47ad21fc397bbff5276 (diff)
Merge commit 'upstream/0.7.x' into 0.7.x
Diffstat (limited to 'actions/finishremotesubscribe.php')
-rw-r--r--actions/finishremotesubscribe.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index f9094a50c..76db887de 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -237,7 +237,13 @@ class FinishremotesubscribeAction extends Action
{
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
copy($url, $temp_filename);
- return $profile->setOriginal($temp_filename);
+ $imagefile = new ImageFile($profile->id, $temp_filename);
+ $filename = Avatar::filename($profile->id,
+ image_type_to_extension($imagefile->type),
+ null,
+ common_timestamp());
+ rename($temp_filename, Avatar::path($filename));
+ return $profile->setOriginal($filename);
}
function access_token($omb)