aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-02 20:28:11 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-02 20:28:11 +0000
commit8ec42e5baed7c375e07ac0832ab82cd33af987c8 (patch)
treef2b3d54d9fc5cc4b8f75ad303545d2ae8dcd7532
parent6c05ecbda087860f152f6f40c169c01586aaf80f (diff)
downloadelgg-8ec42e5baed7c375e07ac0832ab82cd33af987c8.tar.gz
elgg-8ec42e5baed7c375e07ac0832ab82cd33af987c8.tar.bz2
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
-rw-r--r--engine/lib/views.php8
-rw-r--r--views/default/river/item.php11
2 files changed, 12 insertions, 7 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 495b04ae5..a0c052f70 100644
--- 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
index 000000000..388c0a79b
--- /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