aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-06-11 19:14:25 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-06-11 19:14:25 +0000
commit4f984fc470900df2a2c18dff02895ea2f230e099 (patch)
tree1a6329ac45a354cd121fa4dd864bd888eedc15d8
parentbebc9a864caf99983e28e6d6885a15a9d3b14cd4 (diff)
downloadelgg-4f984fc470900df2a2c18dff02895ea2f230e099.tar.gz
elgg-4f984fc470900df2a2c18dff02895ea2f230e099.tar.bz2
added user avatar river messages back
git-svn-id: http://code.elgg.org/elgg/trunk@9181 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--actions/avatar/crop.php3
-rw-r--r--actions/avatar/upload.php4
-rw-r--r--languages/en.php4
3 files changed, 9 insertions, 2 deletions
diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index ed5faecfa..9c57530ae 100644
--- a/actions/avatar/crop.php
+++ b/actions/avatar/crop.php
@@ -65,5 +65,8 @@ $owner->y1 = $y1;
$owner->y2 = $y2;
system_message(elgg_echo('avatar:crop:success'));
+$view = 'river/user/default/profileiconupdate';
+elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+add_to_river($view, 'update', $owner->guid, $owner->guid);
forward(REFERER);
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index 052212e97..e21aa49c8 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -50,6 +50,10 @@ foreach ($icon_sizes as $name => $size_info) {
$owner->icontime = time();
if (elgg_trigger_event('profileiconupdate', $owner->type, $owner)) {
system_message(elgg_echo("avatar:upload:success"));
+
+ $view = 'river/user/default/profileiconupdate';
+ elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+ add_to_river($view, 'update', $owner->guid, $owner->guid);
}
forward(REFERER);
diff --git a/languages/en.php b/languages/en.php
index a34f3e1f5..d3e6de26f 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -344,8 +344,6 @@ $english = array(
'friends:collections:members' => "Collection members",
'friends:collections:edit' => "Edit collection",
- 'friends:river:add' => "is now a friend with %s",
-
'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
'avatar' => 'Avatar',
@@ -406,6 +404,8 @@ $english = array(
*/
'river' => "River",
'river:relationship:friend' => 'is now friends with',
+ 'friends:river:add' => "is now a friend with %s",
+ 'profile:river:iconupdate' => 'updated their profile icon',
'river:noaccess' => 'You do not have permission to view this item.',
'river:posted:generic' => '%s posted',
'riveritem:single:user' => 'a user',