From 8a73785aee3e51c26c65053a4de7c5d7f0ebb673 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 21 Aug 2010 23:58:35 +0000 Subject: Merged r6586:6587 from 1.7 branch into trunk git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/start.php | 3 +-- mod/groups/views/default/forum/maintopic.php | 2 +- mod/groups/views/default/object/groupforumtopic.php | 20 ++++++++++---------- mod/groups/views/default/river/forum/create.php | 2 +- .../views/default/river/forum/topic/create.php | 2 +- mod/groups/views/default/river/group/create.php | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/start.php b/mod/groups/start.php index 215311ef9..c199b954a 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -342,10 +342,9 @@ global $CONFIG; - $title = friendly_title($entity->name); + $title = elgg_get_friendly_title($entity->name); return $CONFIG->url . "pg/groups/{$entity->guid}/$title/"; - } function groups_groupforumtopic_url($entity) { diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php index ecb7286e8..9d97def97 100644 --- a/mod/groups/views/default/forum/maintopic.php +++ b/mod/groups/views/default/forum/maintopic.php @@ -46,7 +46,7 @@ } //display the date of the comment - echo "

" . friendly_time($vars['entity']->time_created) . "

"; + echo "

" . elgg_view_friendly_time($vars['entity']->time_created) . "

"; echo ""; // close entity_listing_info echo ""; // close entity_listing.topic diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index e32f83cd4..9ebf81642 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -1,17 +1,17 @@ title, ENT_QUOTES, 'UTF-8'); //$description = get_entity($vars['entity']->description); $topic_owner = get_user($vars['entity']->owner_guid); $group = get_entity($vars['entity']->container_guid); -$forum_created = friendly_time($vars['entity']->time_created); +$forum_created = elgg_view_friendly_time($vars['entity']->time_created); $counter = $vars['entity']->countAnnotations("generic_comment"); $last_post = $vars['entity']->getAnnotations("generic_comment", 1, 0, "desc"); //get the time and user @@ -32,7 +32,7 @@ if(get_context() == "search"){ }else{ $info = "

" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "
"; } - if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " getURL() . "\">" . $u->name . ""); + if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), elgg_view_friendly_time($last_time), " getURL() . "\">" . $u->name . ""); $info .= '

'; //get the group avatar $icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny')); @@ -41,7 +41,7 @@ if(get_context() == "search"){ if ($group instanceof ElggGroup) { $info .= "

" . elgg_echo('group') . ": getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."

"; } - + }else{ if($counter == 1){ $info = "

" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "

"; @@ -57,15 +57,15 @@ if(get_context() == "search"){ 'text' => " ", 'confirm' => elgg_echo('deleteconfirm'), )) . ""; - - } + + } if (($last_time) && ($u)) { - $info.= "

" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by getURL() . "\">" . $u->name . "

"; + $info.= "

" . elgg_echo('groups:updated') . " " . elgg_view_friendly_time($last_time) . " by getURL() . "\">" . $u->name . "

"; } //get the user avatar - $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny')); + $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny')); } - + //display echo elgg_view_listing($icon, $info); \ No newline at end of file diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php index e99c77a4e..7fc3affe7 100644 --- a/mod/groups/views/default/river/forum/create.php +++ b/mod/groups/views/default/river/forum/create.php @@ -16,7 +16,7 @@ $url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; $url_user = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " "; - $string .= elgg_echo("groupforum:river:annotate:create") . " | " . $object->title . " ". friendly_time($object->time_created) ."Visit discussion"; + $string .= elgg_echo("groupforum:river:annotate:create") . " | " . $object->title . " ". elgg_view_friendly_time($object->time_created) ."Visit discussion"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= ""; $string .= "
"; diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php index b44922022..0d70ad718 100644 --- a/mod/groups/views/default/river/forum/topic/create.php +++ b/mod/groups/views/default/river/forum/topic/create.php @@ -16,7 +16,7 @@ $string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": "; $string .= "" . $object->title . ""; $string .= " " . elgg_echo('groups:ingroup') . " getURL()}\">" . $group->name . ""; - $string .= " ". friendly_time($object->time_created); + $string .= " ". elgg_view_friendly_time($object->time_created); if (isloggedin() && $object->status != "closed") { $string .= '' . elgg_echo('generic_comments:text') . ''; $string .= elgg_view('likes/forms/link', array('entity' => $object)); diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php index 3f34605ac..961750974 100644 --- a/mod/groups/views/default/river/group/create.php +++ b/mod/groups/views/default/river/group/create.php @@ -7,7 +7,7 @@ $url = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("groups:river:created"),$url) . " "; $string .= " getURL() . "\">" . $object->name . ""; - $string .= " ". friendly_time($object->time_created); + $string .= " ". elgg_view_friendly_time($object->time_created); if (isloggedin()) { $string .= elgg_view('likes/forms/link', array('entity' => $object)); } -- cgit v1.2.3