mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 14:40:06 +01:00
Code Issues Projects Releases Wiki Activity

MDL-23108, fixed fullname in nonjs comment block

Browse Source
This commit is contained in:
Dongsheng Cai 2010-07-12 08:49:11 +00:00
parent 42aeb70926
commit 4df53d1a23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comment/comment.js
View File

@ -169,7 +169,11 @@ bodyContent: '<div class="comment-delete-confirm"><a href="#" id="confirmdelete-
for(var i in list) {
var htmlid = 'comment-'+list[i].id+'-'+this.client_id;
var val = template.get('innerHTML');
val = val.replace('___name___', list[i].username);
if (list[i].profileurl) {
val = val.replace('___name___', '<a href="'+list[i].profileurl+'">'+list[i].fullname+'</a>');
} else {
val = val.replace('___name___', list[i].fullname);
}
if (list[i]['delete']||newcmt) {
list[i].content = '<div class="comment-delete"><a href="#" id ="comment-delete-'+this.client_id+'-'+list[i].id+'" title="'+M.str.moodle.deletecomment+'"><img src="'+M.util.image_url('t/delete', 'core')+'" /></a></div>' + list[i].content;
}

16
comment/lib.php
View File

@ -389,6 +389,7 @@ EOD;
/**
* Return matched comments
*
* @param int $page
* @return mixed
*/
@ -403,7 +404,7 @@ EOD;
$this->page = $page;
$params = array();
$start = $page * $CFG->commentsperpage;
$ufields = user_picture::fields('u');
$ufields = user_picture::fields('u', array('username'));
$sql = "SELECT $ufields, c.id AS cid, c.content AS ccontent, c.format AS cformat, c.timecreated AS ctimecreated
FROM {comments} c
JOIN {user} u ON u.id = c.userid
@ -422,8 +423,10 @@ EOD;
$c->content = $u->ccontent;
$c->format = $u->cformat;
$c->timecreated = $u->ctimecreated;
$url = $CFG->httpswwwroot.'/user/view.php?id='.$c->id.'&amp;course='.$this->courseid;
$c->username = '<a href="'.$url.'">'.fullname($u).'</a>';
$url = new moodle_url('/user/view.php', array('id'=>$c->id, 'course'=>$this->courseid));
$c->username = $u->username;
$c->profileurl = $url;
$c->fullname = fullname($u);
$c->time = userdate($c->timecreated, get_string('strftimerecent', 'langconfig'));
$c->content = format_text($c->content, $c->format);
@ -511,7 +514,10 @@ EOD;
if (!empty($cmt_id)) {
$newcmt->id = $cmt_id;
$newcmt->time = userdate($now, get_string('strftimerecent', 'langconfig'));
$newcmt->username = fullname($USER);
$newcmt->username = $USER->username;
$newcmt->fullname = fullname($USER);
$url = new moodle_url('/user/view.php', array('id'=>$USER->id, 'course'=>$this->courseid));
$newcmt->profileurl = $url->out();
$newcmt->content = format_text($newcmt->content);
$newcmt->avatar = $OUTPUT->user_picture($USER, array('size'=>16));
return $newcmt;
@ -624,7 +630,7 @@ EOD;
$patterns[] = '___content___';
$patterns[] = '___time___';
$replacements[] = $cmt->avatar;
$replacements[] = fullname($cmt);
$replacements[] = html_writer::link($cmt->profileurl, $cmt->fullname);
$replacements[] = $cmt->content;
$replacements[] = userdate($cmt->timecreated, get_string('strftimerecent', 'langconfig'));