From 7fab6390acd5cfcdd8458d43eae4ff984aefae43 Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 13 Feb 2009 13:29:51 +0000
Subject: new river work committed for profiles

git-svn-id: https://code.elgg.org/elgg/trunk@2741 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/actions/edit.php                                 |  2 ++
 mod/profile/actions/iconupload.php                           |  3 +++
 .../views/default/river/user/default/profileiconupdate.php   |  4 +---
 .../views/default/river/user/default/profileupdate.php       | 12 +++++-------
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'mod/profile')

diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php
index e7f307756..7a4716646 100644
--- a/mod/profile/actions/edit.php
+++ b/mod/profile/actions/edit.php
@@ -63,6 +63,8 @@
 			// Notify of profile update
 			trigger_elgg_event('profileupdate',$user->type,$user);
 			
+			//add to river
+			add_to_river('river/user/default/profileupdate','update',$_SESSION['user']->guid,$_SESSION['user']->guid);
 			
 			system_message(elgg_echo("profile:saved"));
 			
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
index db948b36a..aec433bbd 100644
--- a/mod/profile/actions/iconupload.php
+++ b/mod/profile/actions/iconupload.php
@@ -59,6 +59,9 @@
 					system_message(elgg_echo("profile:icon:uploaded"));
 					
 					trigger_elgg_event('profileiconupdate',$_SESSION['user']->type,$_SESSION['user']);
+					
+					//add to river
+					add_to_river('river/user/default/profileiconupdate','update',$_SESSION['user']->guid,$_SESSION['user']->guid);
 				
 				} else {
 					system_message(elgg_echo("profile:icon:notfound"));					
diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php
index c56699afe..464f07abc 100644
--- a/mod/profile/views/default/river/user/default/profileiconupdate.php
+++ b/mod/profile/views/default/river/user/default/profileiconupdate.php
@@ -1,8 +1,6 @@
 <?php
 
-	$statement = $vars['statement'];
-	
-	$performed_by = $statement->getSubject();
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
 	
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = sprintf(elgg_echo("profile:river:iconupdate"),$url);
diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php
index 36f775991..8f3690ae2 100644
--- a/mod/profile/views/default/river/user/default/profileupdate.php
+++ b/mod/profile/views/default/river/user/default/profileupdate.php
@@ -1,11 +1,9 @@
 <?php
-
-	$statement = $vars['statement'];
-	
-	$performed_by = $statement->getSubject();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("profile:river:update"),$url);
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("profile:river:update"),$url);
 	
 ?>
 
-- 
cgit v1.2.3