Merged [6819] into trunk from 1.7 branch

git-svn-id: http://code.elgg.org/elgg/trunk@6856 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index e986f99feb41cc430ce9596f7b97a87362c704cb..847654a2596265d8cbebae86873bea742a129ed1 100644 (file)
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -96,6 +96,7 @@ $english = array(
        'groups:yes' => 'yes',
        'groups:no' => 'no',
        'groups:lastupdated' => 'Last updated %s by %s',
+       'groups:lastcomment' => 'Last comment %s by %s',
        'groups:pages' => 'Group pages',
        'groups:files' => 'Group files',
 

diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 1612eb77851e29b568b038921e52ff7f79b861bc..e07072b78c03e84b102a0ae6f48078f5f7b19cd9 100644 (file)
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -70,7 +70,9 @@ if (get_context() == "search") {
    }
 
        if (($last_time) && ($u)) {
-               $info.= "<p class='entity_subtext'>" . elgg_echo('groups:updated') . " " . elgg_view_friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></p>";
+               $commenter_link = "<a href\"{$u->getURL()}\">$u->name</a>";
+               $text = sprintf(elgg_echo('groups:lastcomment'), elgg_view_friendly_time($last_time), $commenter_link);
+               $info .= "<p class='entity_subtext'>$text</p>";
        }
     //get the user avatar
        $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));