aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/river.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 32fa74516..10c8ac423 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -63,7 +63,8 @@
$object = $tmp->getObjectFromID($log->object_id);
// Exists and we have access to it
- if (is_a($object, $class))
+ // if (is_a($object, $class))
+ if ($object instanceof $class)
{
// If no relationship defined or it matches $relationship
if (
@@ -77,9 +78,13 @@
// See if anything can handle it
$tam = "";
- // test if view exist and if so
+ // test if view exist and if so
+ if (isset($by_user_obj) && $by_user_job instanceof ElggUser) {
+ } else {
+ $by_user_obj = get_entity($log->performed_by_guid);
+ }
$tam = elgg_view("river/$class/$event", array(
- 'performed_by' => ($by_user_obj instanceof ElggUser) ? $by_user_obj : get_entity($log->performed_by_guid),
+ 'performed_by' => $by_user_obj,
'log_entry' => $log,
'object' => $object
));