From cf2b886d4d8729c81d84df9ad8db08df552de4a9 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Sun, 19 Jun 2005 16:45:11 +0000
Subject: [PATCH] Using the time class properly.

---
 mod/glossary/formats/faq/faq_format.php                   | 2 +-
 .../fullwithoutauthor/fullwithoutauthor_format.php        | 4 ++--
 mod/glossary/lib.php                                      | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php
index b2fcccc2f81..eefb5bd7a9b 100644
--- a/mod/glossary/formats/faq/faq_format.php
+++ b/mod/glossary/formats/faq/faq_format.php
@@ -15,7 +15,7 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo
         glossary_print_entry_concept($entry);
         echo '</span><br />';
 
-        echo '<span class="author">('.get_string('lastedited').': '.
+        echo '<span class="time">('.get_string('lastedited').': '.
              userdate($entry->timemodified).')</span>';
         echo '</td>';
         echo '<td class="entryattachment">';
diff --git a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
index 6e124f4ae98..fad2ba4f37d 100644
--- a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
+++ b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
@@ -15,8 +15,8 @@ function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry,
         glossary_print_entry_concept($entry);
         echo '</span><br />';
 
-        echo '('.get_string('lastedited').': '.
-             userdate($entry->timemodified).')';
+        echo '<span class="time">('.get_string('lastedited').': '.
+             userdate($entry->timemodified).')</span>';
         echo '</td>';
         echo '<td class="entryattachment">';
 
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index a4c61f1d6c9..de9cd521878 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1516,8 +1516,12 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) {
     print_user_picture($user->id, $course->id, $user->picture);
     echo '</td>';
     echo '<td class="entryheader">';
-    echo "<span class=\"author\"><a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">$fullname</a></span><br />";
-    echo '<span class="time">'.get_string('lastedited').': '.userdate($comment->timemodified).'</span>';
+
+    $fullname = fullname($user, isteacher($course->id));
+    $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$course->id.'">'.$fullname.'</a>';
+    $by->date = userdate($comment->timemodified);
+    echo '<span class="author">'.get_string('bynameondate', 'forum', $by).'</span>';
+
     echo '</td></tr>';
 
     echo '<tr valign="top"><td class="left side">';