Fixes #4372. Using elgg_view_friendly_time() in river entries.

diff --git a/CHANGES.txt b/CHANGES.txt
index cabfd604b0046967a0cd07b071cfcf8114aeee79..2a3339c95c3cbf644215451119aae772728e60f9 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,10 @@ Version 1.8.5
                   an account with Twitter.
    * Files: PDF files are downloaded as "inline" to display in the browser.
 
+ API:
+   * River entries' timestamps use elgg_view_friendly_time() and can be 
+     overridden with the friendly time output view.
+
 Version 1.8.4
 (April 24, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
 

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index 6894b81e28835af520a5cb9f40fc2b3cd78821ca..2cd7f22892b4b56b9772fa92e5e7345a95c87fa1 100644 (file)
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -18,7 +18,7 @@ $menu = elgg_view_menu('river', array(
 ));
 
 // river item header
-$timestamp = elgg_get_friendly_time($item->getPostedTime());
+$timestamp = elgg_view_friendly_time($item->getPostedTime());
 
 $summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item'])));
 if ($summary === false) {