L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-30909-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-09-18 15:08:00 +08:00
parent bb67dc33e1 6d3249780b
commit 85aa469960
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/lib.php
+1 -1
View File
@@ -3344,7 +3344,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
}
if ($reply) {
$commands[] = array('url'=>new moodle_url('/mod/forum/post.php', array('reply'=>$post->id)), 'text'=>$str->reply);
$commands[] = array('url'=>new moodle_url('/mod/forum/post.php#mform1', array('reply'=>$post->id)), 'text'=>$str->reply);
}
if ($CFG->enableportfolios && ($cm->cache->caps['mod/forum:exportpost'] || ($ownpost && $cm->cache->caps['mod/forum:exportownpost']))) {
mod/forum/post.php
+5
View File
@@ -528,8 +528,10 @@ if ($USER->id != $post->userid) { // Not the original author, so add a message
unset($data);
}
$formheading = '';
if (!empty($parent)) {
$heading = get_string("yourreply", "forum");
$formheading = get_string('reply', 'forum');
} else {
if ($forum->type == 'qanda') {
$heading = get_string('yournewquestion', 'forum');
@@ -883,6 +885,9 @@ if (!empty($parent)) {
}
}
if (!empty($formheading)) {
echo $OUTPUT->heading($formheading, 2, array('class' => 'accesshide'));
}
$mform_post->display();
echo $OUTPUT->footer();