diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-21 23:58:35 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-21 23:58:35 +0000 |
| commit | 8a73785aee3e51c26c65053a4de7c5d7f0ebb673 (patch) | |
| tree | 41e7e607886b0498a0d8d4dc79df6aaa5094d385 /mod/riverdashboard/views/default | |
| parent | b81f168b0bfc298c6eb1c0a2a857311f076c40bd (diff) | |
| download | elgg-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/riverdashboard/views/default')
| -rw-r--r-- | mod/riverdashboard/views/default/river/item/wrapper.php | 2 | ||||
| -rw-r--r-- | mod/riverdashboard/views/default/riverdashboard/sitemessage.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index 482057ed4..2b964510d 100644 --- a/mod/riverdashboard/views/default/river/item/wrapper.php +++ b/mod/riverdashboard/views/default/river/item/wrapper.php @@ -105,7 +105,7 @@ if ($comments){ echo "<div class='river_comment_contents'>"; echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a> <span class="elgg_excerpt">' . parse_urls($contents) . '</span>'; - echo "<span class='entity_subtext'>" . friendly_time($comment->time_created) . "</span>"; + echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>"; echo "</div></div>"; $counter++; } diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php index 4d1eea2af..fa582bab3 100644 --- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php +++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php @@ -16,7 +16,7 @@ $site_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'site if ($site_message) { $mes = $site_message[0]; $message = $mes->description; - $dateStamp = friendly_time($mes->time_created); + $dateStamp = elgg_view_friendly_time($mes->time_created); $delete = elgg_view("output/confirmlink",array( 'href' => $vars['url'] . "action/riverdashboard/delete?message=" . $mes->guid, 'text' => elgg_echo('delete'), |