Index: openacs-4/packages/planner/planner-patch/assessment-diff.patch
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/planner/planner-patch/assessment-diff.patch,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/planner/planner-patch/assessment-diff.patch	27 Jul 2009 17:49:24 -0000	1.2
+++ openacs-4/packages/planner/planner-patch/assessment-diff.patch	15 Dec 2009 22:11:58 -0000	1.3
@@ -18,7 +18,7 @@
   }
   
 + ## Planner View -> Extend Form
-+     callback -catch -impl "dotlrn" planner::extend_form -block_id $block_id -form_name "assessment_form"
++     callback -catch -impl planner planner::extend_form -block_id $block_id -form_name "assessment_form"
 + ###
 + 
   ad_form -extend -name assessment_form -new_request {
@@ -31,7 +31,7 @@
       }
   } -after_submit {
 +     ## Planner View
-+         callback -catch -impl "dotlrn" planner::insert_object -block_id $block_id -object_id $assessment_id
++         callback -catch -impl planner planner::insert_object -block_id $block_id -object_id $assessment_id
 +     ###
       if {$permission_p} {
           permission::grant -party_id "-1" -object_id $assessment_id -privilege read
Index: openacs-4/packages/planner/planner-patch/evaluation-diff.patch
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/planner/planner-patch/evaluation-diff.patch,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/planner/planner-patch/evaluation-diff.patch	10 Jul 2009 17:03:41 -0000	1.1
+++ openacs-4/packages/planner/planner-patch/evaluation-diff.patch	15 Dec 2009 22:11:58 -0000	1.2
@@ -120,7 +120,7 @@
   } 
   
 + ## Planner View -> Extend Form
-+     callback -catch -impl "dotlrn" planner::extend_form -block_id $block_id -form_name "task"
++     callback -catch -impl planner planner::extend_form -block_id $block_id -form_name "task"
 + ###
 + 
   ad_form -extend -name task -form {
@@ -133,7 +133,7 @@
   	db_dml lob_size { *SQL* }
   
 + ## Planner View
-+         callback -catch -impl "dotlrn" planner::insert_object -block_id $block_id -object_id $task_id
++         callback -catch -impl planner planner::insert_object -block_id $block_id -object_id $task_id
 + ###
   
   	if { ![empty_string_p $upload_file] }  {
@@ -171,3 +171,16 @@
   
   <formtemplate id="task"></formtemplate>
   
+diff -crNB dotlrn-2.4.1/packages/evaluation/www/task-view-postgresql.xql evaluation/www/task-view-postgresql.xql
+*** dotlrn-2.4.1/packages/evaluation/www/task-view-postgresql.xql	    2005-04-07 05:26:58.000000000 -0600
+--- evaluation/www/task-view-postgresql.xql	    2009-11-25 08:29:25.000000000 -0600
+***************
+*** 12,17 ****
+--- 12,18 ----
+                 et.description,
+                 et.title as task_title,
+                 et.data as task_data,
++                et.task_item_id as task_item_id,
+  	       et.revision_id as task_revision_id,
+                 ets.title as solution_title,
+                 ets.data as solution_data,
Index: openacs-4/packages/planner/planner-patch/forums-diff.patch
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/planner/planner-patch/forums-diff.patch,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/planner/planner-patch/forums-diff.patch	10 Jul 2009 17:03:41 -0000	1.1
+++ openacs-4/packages/planner/planner-patch/forums-diff.patch	15 Dec 2009 22:11:58 -0000	1.2
@@ -8,7 +8,7 @@
       }
   
 + ## Planner View
-+     callback -catch -impl "dotlrn" planner::insert_object -block_id $block_id -object_id $forum_id
++     callback -catch -impl planner planner::insert_object -block_id $block_id -object_id $forum_id
 + ###
 + 
       ad_returnredirect $return_url
@@ -22,7 +22,7 @@
       element set_value forum name $name
 + 
 + ## Planner View -> Extend Form
-+     callback -catch -impl "dotlrn" planner::extend_form -block_id $block_id -form_name "forum"
++     callback -catch -impl planner planner::extend_form -block_id $block_id -form_name "forum"
 + ###
   }
   
Index: openacs-4/packages/planner/planner-patch/theme-zen-diff.patch
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/planner/planner-patch/theme-zen-diff.patch,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/planner/planner-patch/theme-zen-diff.patch	10 Jul 2009 17:03:41 -0000	1.1
+++ openacs-4/packages/planner/planner-patch/theme-zen-diff.patch	15 Dec 2009 22:11:58 -0000	1.2
@@ -3,13 +3,17 @@
 --- theme-zen/lib/lrn-master.adp	2009-07-07 14:00:38.000000000 -0400
 ***************
 *** 84,89 ****
---- 84,92 ----
+--- 84,96 ----
       <div id="sub-navigation">
         <div class="block-marker">#theme-zen.begin_sub_navigation#</div>
-        @subnavbar;noquote@
-+       <if @community_id@ ne "" and @planner_p@>
-+         <include src="/packages/planner/lib/navigation" planner_object_id="@planner_object_id@">
++       <if @block_view_p@ >
++         <if @community_id@ ne "" and @planner_p@>
++           <include src="/packages/planner/lib/navigation" planner_object_id="@planner_object_id@">
++         </if>
 +       </if>
++       <else>
+        @subnavbar;noquote@
++       </else>
       </div>
     </if>
   
@@ -18,7 +22,7 @@
 --- theme-zen/lib/lrn-master.tcl	2009-07-07 14:00:56.000000000 -0400
 ***************
 *** 277,279 ****
---- 277,285 ----
+--- 277,286 ----
       template::head::add_css -href "/resources/dotlrn/dotlrn-toolbar.css"
       template::add_header -src "/packages/dotlrn/lib/toolbar"
   }
@@ -27,4 +31,5 @@
 + if {![exists_and_not_null planner_object_id]} {
 +     set planner_object_id 0
 + }
++ set block_view_p [planner::enabled_p -community_id $community_id]
 + ###