Merge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle

This commit is contained in:
Damyon Wiese 2014-05-19 12:08:24 +08:00
commit 634c982104

View File

@ -528,7 +528,7 @@ class comment {
$c->timecreated = $u->ctimecreated; $c->timecreated = $u->ctimecreated;
$c->strftimeformat = get_string('strftimerecent', 'langconfig'); $c->strftimeformat = get_string('strftimerecent', 'langconfig');
$url = new moodle_url('/user/view.php', array('id'=>$u->id, 'course'=>$this->courseid)); $url = new moodle_url('/user/view.php', array('id'=>$u->id, 'course'=>$this->courseid));
$c->profileurl = $url->out(true); $c->profileurl = $url->out(false); // URL should not be escaped just yet.
$c->fullname = fullname($u); $c->fullname = fullname($u);
$c->time = userdate($c->timecreated, $c->strftimeformat); $c->time = userdate($c->timecreated, $c->strftimeformat);
$c->content = format_text($c->content, $c->format, $formatoptions); $c->content = format_text($c->content, $c->format, $formatoptions);