Merge branch 'MDL-38099-34' of https://github.com/lucaboesch/moodle i…

…nto MOODLE_34_STABLE
moodle · Apr 18, 2018 · 4d53f25 · 4d53f25
2 parents 524312d + 868681e
commit 4d53f25
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/comment/lib.php b/comment/lib.php
@@ -577,7 +577,7 @@ public function get_comments($page = '') {
             $c->content     = $u->ccontent;
             $c->format      = $u->cformat;
             $c->timecreated = $u->ctimecreated;
-            $c->strftimeformat = get_string('strftimerecent', 'langconfig');
+            $c->strftimeformat = get_string('strftimerecentfull', 'langconfig');
             $url = new moodle_url('/user/view.php', array('id'=>$u->id, 'course'=>$this->courseid));
             $c->profileurl = $url->out(false); // URL should not be escaped just yet.
             $c->fullname = fullname($u);
@@ -712,7 +712,7 @@ public function add($content, $format = FORMAT_MOODLE) {
         $cmt_id = $DB->insert_record('comments', $newcmt);
         if (!empty($cmt_id)) {
             $newcmt->id = $cmt_id;
-            $newcmt->strftimeformat = get_string('strftimerecent', 'langconfig');
+            $newcmt->strftimeformat = get_string('strftimerecentfull', 'langconfig');
             $newcmt->fullname = fullname($USER);
             $url = new moodle_url('/user/view.php', array('id' => $USER->id, 'course' => $this->courseid));
             $newcmt->profileurl = $url->out();