Permalink
Browse files

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

…nto MOODLE_33_STABLE
  • Loading branch information...
dmonllao committed Apr 18, 2018
2 parents 5c4ff2d + 9152286 commit dced5c43c8e14a129f3d2eb1ab0d06e10e12b6cf
Showing with 2 additions and 2 deletions.
  1. +2 −2 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();

0 comments on commit dced5c4

Please sign in to comment.