Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -r1.22 -r1.22.2.1
--- openacs-4/packages/assessment/lib/assessment.tcl	21 Jan 2008 20:25:35 -0000	1.22
+++ openacs-4/packages/assessment/lib/assessment.tcl	22 Jul 2008 09:20:22 -0000	1.22.2.1
@@ -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 {}
Index: openacs-4/packages/assessment/www/instructions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/instructions.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/assessment/www/instructions.tcl	15 May 2007 20:14:17 -0000	1.2
+++ openacs-4/packages/assessment/www/instructions.tcl	22 Jul 2008 09:20:22 -0000	1.2.2.1
@@ -16,6 +16,11 @@
     -privilege read
 
 as::assessment::data -assessment_id $assessment_id
+if { $assessment_data(publish_status) ne "live" } {
+    ad_return_complaint 1 [_ assessment.Requested_assess_is_no_longer_available]
+    return
+}
+
 if {$assessment_data(instructions) eq ""} {
     set assessment_data(instructions) "[_ assessment.lt_default_instructions]"
 }