Merged fix for MDL-6521

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 55a446287ac97d4950d30edf7a76fd40813be142..7cac0ccb3f33275c563e926b5293ba1e025d9b4e 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -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);