3 files changed, 12 insertions, 43 deletions
diff --git a/mod/blog/views/default/river/object/blog/annotate.php b/mod/blog/views/default/river/object/blog/annotate.php
deleted file mode 100644
index 77b75c6d9..000000000
--- a/mod/blog/views/default/river/object/blog/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("blog:river:posted"),$url) . " ";
-	$string .= elgg_echo("blog:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-
-?>
-
-<?php echo $string; ?>
-\ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index b5b3dc2e4..b808f1bdc 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -1,20 +1,15 @@
 <?php
+/**
+ * Blog river view.
+ */
 
-	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
-	$string = sprintf(elgg_echo("blog:river:created"),$url) . " ";
-	$string .= elgg_echo("blog:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-	$string .= "<div class=\"river_content_display\">";
-	if(strlen($contents) > 200) {
-        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
-    }else{
-	    $string .= $contents;
-    }
-	$string .= "</div>";
-?>
+$object = $vars['item']->getObjectEntity();
 
-<?php echo $string; ?>
-\ No newline at end of file
+$excerpt = $object->excerpt ? $object->excerpt : $object->description;
+$excerpt = strip_tags($excerpt);
+$excerpt = elgg_get_excerpt($excerpt);
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
diff --git a/mod/blog/views/default/river/object/blog/update.php b/mod/blog/views/default/river/object/blog/update.php
deleted file mode 100644
index cf98afa8b..000000000
--- a/mod/blog/views/default/river/object/blog/update.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("blog:river:updated"),$url) . " ";
-    $string .= elgg_echo("blog:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-    	
-?>
-
-<?php echo $string; ?>
-\ No newline at end of file