Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-38099-34' of https://github.com/lucaboesch/moodle i…
…nto MOODLE_34_STABLE
  • Loading branch information
David Monllao committed Apr 18, 2018
2 parents 524312d + 868681e commit 4d53f25
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions comment/lib.php
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 4d53f25

Please sign in to comment.