mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merged fix for MDL-6521

Browse Source
This commit is contained in:
vyshane 2006-09-25 05:00:36 +00:00
parent af5d9f6a06
commit 66035aafd9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/forum/lib.php
View File

@ -1993,10 +1993,12 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
}
}
$forumtype = get_field('forum', 'type', 'id', $post->forum);
$age = time() - $post->created;
/// Hack for allow to edit news posts those are not displayed yet until they are displayed
if (!$post->parent
&& get_field('forum', 'type', 'id', $post->forum) == 'news'
&& $forumtype == 'news'
&& get_field_sql("SELECT id FROM {$CFG->prefix}forum_discussions WHERE id = $post->discussion AND timestart > ".time())) {
$age = 0;
}
@ -2007,7 +2009,9 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
}
}
if (has_capability('mod/forum:splitdiscussions', $modcontext) and $post->parent) {
if (has_capability('mod/forum:splitdiscussions', $modcontext)
&& $post->parent && $forumtype != 'single') {
$commands[] = '<a href="'.$CFG->wwwroot.'/mod/forum/post.php?prune='.$post->id.
'" title="'.$strpruneheading.'">'.$strprune.'</a>';
}
@ -3276,6 +3280,7 @@ function forum_print_discussion($course, $forum, $discussion, $post, $mode, $can
}
$post->forum = $forum->id; // Add the forum id to the post object, later used by forum_print_post
$post->forumtype = $forum->type;
$post->subject = format_string($post->subject);