diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index cd95b80f4af7c..8951467babeb2 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -161,7 +161,7 @@
         $p = array(
             'discussionid' => $discussion->id,
         );
-        $portfolio = portfolio_add_button('forum_portfolio_caller', $p, '/mod/forum/lib.php', true, true);
+        //$portfolio = portfolio_add_button('forum_portfolio_caller', $p, '/mod/forum/lib.php', true, true);
     }
     echo '<table width="100%" class="discussioncontrols"><tr><td>';
 
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index bf750673e7503..eb6ebb0d43448 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3006,7 +3006,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
         $p = array(
             'postid' => $post->id,
         );
-        $commands[] = portfolio_add_button('forum_portfolio_caller', $p, '/mod/forum/lib.php', false, true);
+        //$commands[] = portfolio_add_button('forum_portfolio_caller', $p, '/mod/forum/lib.php', false, true);
     }
 
     echo '<div class="commands">';
@@ -6933,7 +6933,7 @@ function __construct($callbackargs) {
             if (!$this->post) {
                 print_error('attachmentsnopost', 'forum');
             }
-            if (!get_directory_list(forum_file_area($this->post->id))) {
+            if (!get_directory_list(forum_file_area($this->post))) {
                 print_error('noattachments', 'forum');
             }
         }
@@ -6944,6 +6944,12 @@ function get_return_url() {
         return $CFG->wwwroot . '/mod/forum/discuss.php?d=' . $this->cm->id;
     }
 
+    function get_navigation() {
+        $navlinks = array();
+        $navlinks[] = array('name' => format_string($this->discussion->name), 'link' => 'discuss.php?d=' . $this->discussion->id, 'type' => 'title');
+        return array($navlinks, $this->cm);
+    }
+
     function prepare_package($tempdir) {
         global $CFG;
         if ($this->attachment) {
@@ -6954,7 +6960,7 @@ function prepare_package($tempdir) {
             }
             return true;
         }
-        print_error('TODO');
+        portfolio_exporter::raise_error('TODO - see MDL-15758');
         // @todo see MDL-15758
     }