aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/river.php6
-rw-r--r--mod/profile/views/default/river/ElggUser/update.php4
-rw-r--r--views/default/river/wrapper.php33
3 files changed, 39 insertions, 4 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 7461a4f60..fbafa44d7 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -87,7 +87,11 @@
'performed_by' => $by_user_obj,
'log_entry' => $log,
'object' => $object
- ));
+ ));
+
+ if (!empty($tam)) {
+ $tam = elgg_view("river/wrapper",array('entry' => $tam, 'log' => $log));
+ }
if ($tam)
{
diff --git a/mod/profile/views/default/river/ElggUser/update.php b/mod/profile/views/default/river/ElggUser/update.php
index f518ef2c8..c9b710512 100644
--- a/mod/profile/views/default/river/ElggUser/update.php
+++ b/mod/profile/views/default/river/ElggUser/update.php
@@ -7,6 +7,4 @@
?>
-<p class="river_profile_update">
- <?php echo $string; ?>
-</p> \ No newline at end of file
+<?php echo $string; ?> \ No newline at end of file
diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php
new file mode 100644
index 000000000..804f4a198
--- /dev/null
+++ b/views/default/river/wrapper.php
@@ -0,0 +1,33 @@
+<?php
+
+ /**
+ * Elgg river item wrapper.
+ * Wraps all river items.
+ *
+ * @package Elgg
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.com/
+ */
+
+?>
+
+<div class="river_item">
+
+ <p class="river_<?php echo $vars['log']->object_class; ?>_<?php echo $vars['log']->event; ?>">
+ <?php
+
+ echo $vars['entry'];
+
+ ?>
+ <span class="river_item_time">
+ (<?php
+
+ echo friendly_time($vars['log']->time_created);
+
+ ?>)
+ </span>
+ </p>
+
+</div> \ No newline at end of file