added user avatar river messages back

git-svn-id: http://code.elgg.org/elgg/trunk@9181 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
index ed5faecfa7993ade7ede0863ff3b2859489729ac..9c57530aee8c26acbcaa586d3017b02d3f75bb77 100644 (file)
--- 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 052212e979e8505aeb1ad8c09b5c493bd175a108..e21aa49c8ec2a1f79b6e6598768ced891e71603e 100644 (file)
--- 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 a34f3e1f58ad0cbb1f5403dcac6aeda7e25c42a8..d3e6de26fff97e0430a3b12537e854da6de50726 100644 (file)
--- 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',