diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
| commit | 6ba1737c22a002a71210fcd15ad36c3c2bc68402 (patch) | |
| tree | 22e44b38f986ac94ecb7d831d043d87ac687bf27 /engine/lib/river2.php | |
| parent | 368c947601348a68dd6805658e637a1e634779e5 (diff) | |
| download | elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.gz elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.bz2 | |
merge -r5832:5898 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6055 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/river2.php')
| -rw-r--r-- | engine/lib/river2.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/river2.php b/engine/lib/river2.php index 8e015ea0d..8fb20ac40 100644 --- a/engine/lib/river2.php +++ b/engine/lib/river2.php @@ -374,8 +374,10 @@ function elgg_get_river_items($subject_guid = 0, $object_guid = 0, $subject_rela function elgg_view_river_item($item) { if (isset($item->view)) { $object = get_entity($item->object_guid); - if (!$object) { - $body = elgg_view('river/item/noaccess'); + $subject = get_entity($item->subject_guid); + if (!$object || !$subject) { + // probably means an entity is disabled + return false; } else { if (elgg_view_exists($item->view)) { $body = elgg_view($item->view,array( |