aboutsummaryrefslogtreecommitdiff
path: root/views/default/river/ElggRelationship
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-15 11:06:34 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-15 11:06:34 +0000
commit0f358045ecba1b04a74c198514796fc1dda81d9e (patch)
tree61107a00caf3b572bab86dce7836cd6f814afdc8 /views/default/river/ElggRelationship
parent7bfe15a21379a4acef4b989e8bc07d4f556d9b27 (diff)
downloadelgg-0f358045ecba1b04a74c198514796fc1dda81d9e.tar.gz
elgg-0f358045ecba1b04a74c198514796fc1dda81d9e.tar.bz2
Closes #140
git-svn-id: https://code.elgg.org/elgg/trunk@1424 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/river/ElggRelationship')
-rw-r--r--views/default/river/ElggRelationship/create.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/views/default/river/ElggRelationship/create.php b/views/default/river/ElggRelationship/create.php
index 27c0a8e9e..9033ee0da 100644
--- a/views/default/river/ElggRelationship/create.php
+++ b/views/default/river/ElggRelationship/create.php
@@ -10,21 +10,22 @@
* @link http://elgg.com/
*/
- $performed_by = $vars['performed_by'];
- $log_entry = $vars['log_entry'];
- $object = $vars['entity'];
+ $statement = $vars['statement'];
- // Find out what type of relationship we're dealing with (will only display a few)
- if ($object instanceof ElggRelationship)
+ $performed_by = $statement->getSubject();
+ $event = $statement->getEvent();
+ $object = $statement->getObject();
+
+ if (is_array($object))
{
- switch ($object->relationship)
+ switch ($object['relationship'])
{
// Friending
case 'friend' :
case 'friends' : // 'friends' shouldn't be used, but just incase :)
// Get second object
- $userb = get_entity($object->guid_two);
+ $userb = $object['object'];
// Only users can be friends
if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser))