From dd10d397db7725f87cac92ddfb862ae13b2388cb Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 19 Jun 2008 18:32:35 +0000
Subject: Modified river functions to use a common wrapper

git-svn-id: https://code.elgg.org/elgg/trunk@1004 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/river.php                               |  6 +++-
 .../views/default/river/ElggUser/update.php        |  4 +--
 views/default/river/wrapper.php                    | 33 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 views/default/river/wrapper.php

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
-- 
cgit v1.2.3