Fixes #2846: elgg_view_river_item calls river/item view first.

git-svn-id: http://code.elgg.org/elgg/trunk@7991 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 495b04ae564f4da53f5ea3c0ff0b84ecc1c41344..a0c052f704a77e76db7a0566a1af2baa9456eab4 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1093,13 +1093,7 @@ function elgg_view_river_item($item) {
                return '';
        }
 
-       $vars = array(
-               'image' => elgg_view('core/river/image', array('item' => $item)),
-               'body' => elgg_view('core/river/body', array('item' => $item)),
-               'image_alt' => elgg_view('core/river/controls', array('item' => $item)),
-               'class' => 'elgg-river-item',
-       );
-       return elgg_view('layout/objects/image_block', $vars);
+       return elgg_view('river/item', array('item' => $item));
 }
 
 /**

diff --git a/views/default/river/item.php b/views/default/river/item.php
new file mode 100644 (file)
index 0000000..388c0a7
--- /dev/null
+++ b/views/default/river/item.php
@@ -0,0 +1,11 @@
+<?php
+$item = $vars['item'];
+
+$vars = array(
+       'image' => elgg_view('core/river/image', array('item' => $item)),
+       'body' => elgg_view('core/river/body', array('item' => $item)),
+       'image_alt' => elgg_view('core/river/controls', array('item' => $item)),
+       'class' => 'elgg-river-item',
+);
+
+echo elgg_view('layout/objects/image_block', $vars);
\ No newline at end of file