Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/assessment/lib/assessment.tcl	15 Sep 2008 16:25:06 -0000	1.24
+++ openacs-4/packages/assessment/lib/assessment.tcl	1 Dec 2008 16:57:02 -0000	1.25
@@ -45,9 +45,14 @@
 permission::require_permission -object_id $assessment_id -privilege read
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
-    ad_script_abort
+    return
 }
 
+if { $assessment_data(publish_status) ne "live" } {
+    ad_return_complaint 1 [_ assessment.Requested_assess_is_no_longer_available]
+    return
+}
+
 set assessment_rev_id $assessment_data(assessment_rev_id)
 set number_tries $assessment_data(number_tries)
 db_1row total_tries {}
@@ -330,7 +335,7 @@
     {session_id:text(hidden) {value $session_id}}
 }
 
-multirow create items as_item_id name title description subtext required_p max_time_to_complete presentation_type html submitted_p content as_item_type_id choice_orientation next_title validate_block next_pr_type question_text
+multirow create items as_item_id name title description subtext required_p max_time_to_complete presentation_type html submitted_p content as_item_type_id choice_orientation next_as_item_id validate_block next_pr_type question_text
 
 set unsubmitted_list [list]
 set validate_list [list]
@@ -464,10 +469,10 @@
     upvar 0 items:$i this
     if {$i < ${items:rowcount}} {
 	upvar 0 items:$j next
-	set this(next_title) $next(title)
+	set this(next_as_item_id) $next(as_item_id)
 	set this(next_pr_type) $next(presentation_type)
     } else {
-	set this(next_title) ""
+	set this(next_as_item_id) ""
 	set this(next_pr_type) ""
     }
 }