aboutsummaryrefslogtreecommitdiff
path: root/mod/pages/views/default/pages
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/pages/views/default/pages
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/pages/views/default/pages')
-rw-r--r--mod/pages/views/default/pages/pagelisting.php2
-rw-r--r--mod/pages/views/default/pages/pageprofile.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
index 4dc5dc3b3..419fc8d23 100644
--- a/mod/pages/views/default/pages/pagelisting.php
+++ b/mod/pages/views/default/pages/pagelisting.php
@@ -24,7 +24,7 @@ if ($latest) {
$info .= "<p class=\"owner_timestamp\">".sprintf(elgg_echo("pages:strapline"),
- friendly_time($time_updated),
+ elgg_view_friendly_time($time_updated),
"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
) . "</p>";
}
diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
index cc3113b4e..5702ec415 100644
--- a/mod/pages/views/default/pages/pageprofile.php
+++ b/mod/pages/views/default/pages/pageprofile.php
@@ -63,7 +63,7 @@ if ($rev) {
$owner = get_entity($owner_guid);
echo sprintf(elgg_echo("pages:strapline"),
- friendly_time($time_updated),
+ elgg_view_friendly_time($time_updated),
"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
);