diff options
Diffstat (limited to 'mod/groups')
| -rw-r--r-- | mod/groups/start.php | 3 | ||||
| -rw-r--r-- | mod/groups/views/default/forum/maintopic.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/object/groupforumtopic.php | 20 | ||||
| -rw-r--r-- | mod/groups/views/default/river/forum/create.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/river/forum/topic/create.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/river/group/create.php | 2 |
6 files changed, 15 insertions, 16 deletions
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 "<p class='entity_subtext'>" . friendly_time($vars['entity']->time_created) . "</p>";
+ echo "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";
echo "</div>"; // close entity_listing_info
echo "</div>"; // 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 @@ <?php /** * Elgg Groups latest discussion listing - * + * * @package ElggGroups * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 */ - + //get the required variables $title = htmlentities($vars['entity']->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 = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created'), $forum_created, $counter) . "<br />"; } - if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>"); + if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), elgg_view_friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>"); $info .= '</p>'; //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 .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>"; } - + }else{ if($counter == 1){ $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "</p>"; @@ -57,15 +57,15 @@ if(get_context() == "search"){ 'text' => " ", 'confirm' => elgg_echo('deleteconfirm'), )) . "</div>"; - - } + + } if (($last_time) && ($u)) { - $info.= "<p class='entity_subtext'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></p>"; + $info.= "<p class='entity_subtext'>" . elgg_echo('groups:updated') . " " . elgg_view_friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></p>"; } //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 = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " "; - $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>"; + $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "</span>"; $string .= "<div class=\"river_content_display\">"; 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 .= "<a href=\"" . $url . "\">" . $object->title . "</a>"; $string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>"; - $string .= " <span class='entity_subtext'>". friendly_time($object->time_created); + $string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created); if (isloggedin() && $object->status != "closed") { $string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>'; $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 = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $string = sprintf(elgg_echo("groups:river:created"),$url) . " "; $string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>"; - $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 .= elgg_view('likes/forms/link', array('entity' => $object)); } |