Merge branch 'MDL-30909-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
This commit is contained in:
+1
-1
@@ -3312,7 +3312,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']))) {
|
||||
|
||||
@@ -526,8 +526,10 @@ if ($USER->id != $post->userid) { // Not the original author, so add a message
|
||||
}
|
||||
}
|
||||
|
||||
$formheading = '';
|
||||
if (!empty($parent)) {
|
||||
$heading = get_string("yourreply", "forum");
|
||||
$formheading = get_string('reply', 'forum');
|
||||
} else {
|
||||
if ($forum->type == 'qanda') {
|
||||
$heading = get_string('yournewquestion', 'forum');
|
||||
@@ -875,6 +877,9 @@ if (!empty($parent)) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($formheading)) {
|
||||
echo $OUTPUT->heading($formheading, 2, array('class' => 'accesshide'));
|
||||
}
|
||||
$mform_post->display();
|
||||
|
||||
echo $OUTPUT->footer();
|
||||
|
||||
Reference in New Issue
Block a user