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/thewire/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/thewire/views/default')
| -rw-r--r-- | mod/thewire/views/default/object/thewire.php | 2 | ||||
| -rw-r--r-- | mod/thewire/views/default/river/object/thewire/create.php | 2 | ||||
| -rw-r--r-- | mod/thewire/views/default/thewire/profile_status.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 170c0484a..d87d8f8e3 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -58,7 +58,7 @@ if (isset($vars['entity'])) { <p class="entity_subtext"> <?php echo elgg_echo("thewire:wired") . " " . sprintf(elgg_echo("thewire:strapline"), - friendly_time($vars['entity']->time_created) + elgg_view_friendly_time($vars['entity']->time_created) ); echo " via " . elgg_echo($vars['entity']->method) . "."; ?> diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php index d8d8ba3b5..9dee87274 100644 --- a/mod/thewire/views/default/river/object/thewire/create.php +++ b/mod/thewire/views/default/river/object/thewire/create.php @@ -8,7 +8,7 @@ $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> "; $desc = $object->description; //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc); $string .= parse_urls($desc); -$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created); +$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created); if (isloggedin()){ $string .= "<a class='river_comment_form_button link'>Comment</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php index fa8ccd76b..24f6c447b 100644 --- a/mod/thewire/views/default/thewire/profile_status.php +++ b/mod/thewire/views/default/thewire/profile_status.php @@ -13,7 +13,7 @@ if($latest_wire){ foreach($latest_wire as $lw){ $content = $lw->description; - $time = "<p class='entity_subtext'> (" . friendly_time($lw->time_created) . ")</p>"; + $time = "<p class='entity_subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>"; } } |