Merge commit 'refs/merge-requests/2220' of git://gitorious.org/statusnet/mainline into integration

This commit is contained in:
Brion Vibber 2010-02-25 09:11:07 -08:00
commit 66373f8e5a

View File

@ -94,11 +94,11 @@ function updateAvatars($user)
} }
} }
$orig = clone($avatar); $orig_url = $avatar->url;
$avatar->url = Avatar::url($avatar->filename); $avatar->url = Avatar::url($avatar->filename);
if ($avatar->url != $orig->url) { if ($avatar->url != $orig_url) {
$sql = $sql =
"UPDATE avatar SET url = '" . $avatar->url . "' ". "UPDATE avatar SET url = '" . $avatar->url . "' ".
"WHERE profile_id = " . $avatar->profile_id . " ". "WHERE profile_id = " . $avatar->profile_id . " ".