diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-25 12:52:48 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-25 12:52:48 +0000 |
| commit | 98b32177eb900e779fd2c7976b1e77fb9dd77d63 (patch) | |
| tree | 9fb2e5802f39fbff1ac2024be786c4a142db772a | |
| parent | 5439a340e623ccf17ce2a6b59cf31862beb2ba68 (diff) | |
| download | elgg-98b32177eb900e779fd2c7976b1e77fb9dd77d63.tar.gz elgg-98b32177eb900e779fd2c7976b1e77fb9dd77d63.tar.bz2 | |
The river now passes entities to each river view as $vars['entity']
git-svn-id: https://code.elgg.org/elgg/trunk@1123 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/river.php | 6 | ||||
| -rw-r--r-- | views/default/river/wrapper.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index 12e1dc1f2..8e88c4c32 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -93,13 +93,13 @@ $tam = elgg_view("river/{$subtype}/$event", array(
'performed_by' => $by_user_obj,
'log_entry' => $log,
- 'object' => $object
+ 'entity' => $object
));
} else { $tam = elgg_view("river/$class/$event", array( 'performed_by' => $by_user_obj, 'log_entry' => $log, - 'object' => $object + 'entity' => $object ));
}
@@ -107,7 +107,7 @@ $tam = elgg_view("river/wrapper",array(
'entry' => $tam,
'log' => $log,
- 'object' => $object));
+ 'entity' => $object));
} if ($tam) diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php index 957cbcc78..78692eaef 100644 --- a/views/default/river/wrapper.php +++ b/views/default/river/wrapper.php @@ -11,10 +11,10 @@ * @link http://elgg.com/
*/
- if (isset($vars['object']) && $vars['object'] instanceof ElggEntity) {
+ if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
- $subtype = $vars['object']->subtype;
- if (empty($subtype)) $subtype = $vars['object']->type;
+ $subtype = $vars['entity']->subtype;
+ if (empty($subtype)) $subtype = $vars['entity']->type;
if (empty($subtype)) $subtype = "general";
}
|