Fixes #2221 - rewrite of rover functions has been completed with moving elgg_view_riv...

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

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 50f0c9ac0e0df02fed4ba64e35cba57401b66d0f..f098c0c9ee74bc77fe014b7e09902f435c702ef9 100644 (file)
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -460,34 +460,6 @@ function elgg_river_get_action_where_sql($types) {
        return "(rv.action_type IN ('$type_str'))";
 }
 
-/**
- * Returns a human-readable representation of a river item
- *
- * @param ElggRiverItem $item A river item object
- *
- * @return string|false Depending on success
- */
-function elgg_view_river_item($item) {
-       if (!$item || !$item->getView() || !elgg_view_exists($item->getView())) {
-               return '';
-       }
-
-       $subject = $item->getSubjectEntity();
-       $object = $item->getObjectEntity();
-       if (!$subject || !$object) {
-               // subject is disabled or subject/object deleted
-               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);
-}
-
 /**
  * Sets the access ID on river items for a particular object
  *

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 396eb7c126934aba55aa85ea694f1a815e6f3118..eff5df394c303c5cfb52fe4d6c4e9320f0efed07 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1056,6 +1056,34 @@ function elgg_view_image_block($image, $body, $vars = array()) {
        return elgg_view('layout/objects/image_block', $vars);
 }
 
+/**
+ * Returns a human-readable representation of a river item
+ *
+ * @param ElggRiverItem $item A river item object
+ *
+ * @return string|false Depending on success
+ */
+function elgg_view_river_item($item) {
+       if (!$item || !$item->getView() || !elgg_view_exists($item->getView())) {
+               return '';
+       }
+
+       $subject = $item->getSubjectEntity();
+       $object = $item->getObjectEntity();
+       if (!$subject || !$object) {
+               // subject is disabled or subject/object deleted
+               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);
+}
+
 /**
  * Wrapper function to display search listings.
  *