aboutsummaryrefslogtreecommitdiff
path: root/mod/search
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 23:58:35 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 23:58:35 +0000
commit8a73785aee3e51c26c65053a4de7c5d7f0ebb673 (patch)
tree41e7e607886b0498a0d8d4dc79df6aaa5094d385 /mod/search
parentb81f168b0bfc298c6eb1c0a2a857311f076c40bd (diff)
downloadelgg-8a73785aee3e51c26c65053a4de7c5d7f0ebb673.tar.gz
elgg-8a73785aee3e51c26c65053a4de7c5d7f0ebb673.tar.bz2
Merged r6586:6587 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/search')
-rw-r--r--mod/search/views/default/search/comments/entity.php2
-rw-r--r--mod/search/views/default/search/entity.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/search/views/default/search/comments/entity.php b/mod/search/views/default/search/comments/entity.php
index 0d253c567..001c9c431 100644
--- a/mod/search/views/default/search/comments/entity.php
+++ b/mod/search/views/default/search/comments/entity.php
@@ -44,7 +44,7 @@ if ($entity->getVolatileData('search_unavailable_entity')) {
$description = $entity->getVolatileData('search_matched_comment');
$tc = $entity->getVolatileData('search_matched_comment_time_created');;
-$time = friendly_time($tc);
+$time = elgg_view_friendly_time($tc);
echo <<<___END
<div class="search_listing clearfloat">
diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index df929ef0b..1c282c747 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -52,7 +52,7 @@ $time = $entity->getVolatileData('search_time');
if (!$time) {
$tc = $entity->time_created;
$tu = $entity->time_updated;
- $time = friendly_time(($tu > $tc) ? $tu : $tc);
+ $time = elgg_view_friendly_time(($tu > $tc) ? $tu : $tc);
}
?>
<div class="search_listing clearfloat">