Merged r6671:6683 from 1.7 branch to trunk

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

1 files changed, 7 insertions, 13 deletions

diff --git a/engine/lib/output.php b/engine/lib/output.php
index 3d08f2a28..640ada1cf 100644
--- a/engine/lib/output.php
+++ b/engine/lib/output.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Output functions
- * Processing text for output, formatting HTML,
+ * Processing text for output such as pulling out URLs and extracting excerpts
  *
  * @package Elgg
  * @subpackage Core
@@ -46,6 +46,9 @@ function parse_urls($text) {
  * Create paragraphs from text with line spacing
  * Borrowed from Wordpress.
  *
+ * @param string $pee
+ * @param bool $br
+ * @return string
  **/
 function autop($pee, $br = 1) {
 	$pee = $pee . "\n"; // just to make things a little easier, pad the end
@@ -185,6 +188,8 @@ function friendly_time($time) {
 /**
  * Formats a UNIX timestamp in a friendly way (eg "less than a minute ago")
  *
+ * @see elgg_view_friendly_time()
+ * 
  * @param int $time A UNIX epoch timestamp
  * @return string The friendly time string
  * @since 1.7.2
@@ -243,17 +248,6 @@ function elgg_get_friendly_time($time) {
 }
 
 /**
- * Displays a UNIX timestamp in a friendly way
- *
- * @param int $time A UNIX epoch timestamp
- * @return string The friendly time HTML
- * @since 1.7.2
- */
-function elgg_view_friendly_time($time) {
-	return elgg_view('output/friendlytime', array('time' => $time));
-}
-
-/**
  * Strip tags and offer plugins the chance.
  * Plugins register for output:strip_tags plugin hook.
  * 	Original string included in $params['original_string']
@@ -268,4 +262,4 @@ function elgg_strip_tags($string) {
 	$string = trigger_plugin_hook('format', 'strip_tags', $params, $string);
 
 	return $string;
-}
\ No newline at end of file
+}