MDL-40759 fontawesome: Fix bugs from rebase

This commit is contained in:
Damyon Wiese 2017-03-17 09:57:03 +08:00
parent c8d0efc332
commit 07171e831e
2 changed files with 4 additions and 3 deletions

View file

@ -220,7 +220,7 @@ class comment {
// load template
$this->template = html_writer::start_tag('div', array('class' => 'comment-message'));
$this->template .= html_writer::start_tag('div', array('class' => 'comment-message-meta'));
$this->template .= html_writer::start_tag('div', array('class' => 'comment-message-meta m-r-3'));
$this->template .= html_writer::tag('span', '___picture___', array('class' => 'picture'));
$this->template .= html_writer::tag('span', '___name___', array('class' => 'user')) . ' - ';
@ -264,6 +264,7 @@ class comment {
'commentscount',
'commentsrequirelogin',
'deletecommentbyon',
'deletecomment',
),
'moodle'
);
@ -577,7 +578,7 @@ class comment {
$c->content = $u->ccontent;
$c->format = $u->cformat;
$c->timecreated = $u->ctimecreated;
$c->strftimeformat = get_string('strftimerecentfull', 'langconfig');
$c->strftimeformat = get_string('strftimerecent', '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);