- Merged diff from V3.3

www/admin/question-swap.tcl

@@ -22,15 +22,17 @@ ad_require_permission $survey_id survsimp_modify_survey
 set next_sort_key [expr { $sort_key - 1 }]
 
 db_transaction {
-    db_dml swap_sort_keys "update survsimp_questions
-set sort_key = decode(sort_key, :sort_key, :next_sort_key, :next_sort_key, :sort_key)
-where survey_id = :survey_id
-and sort_key in (:sort_key, :next_sort_key)"
 
-    ad_returnredirect "one?[export_url_vars survey_id]"
+    db_dml swap_sort_keys "
+	update survsimp_questions
+	set sort_key = decode(sort_key, :sort_key, :next_sort_key, :next_sort_key, :sort_key)
+	where survey_id = :survey_id and sort_key in (:sort_key, :next_sort_key)
+    "
 
+    ad_returnredirect "one?[export_url_vars survey_id]"
+    
 } on_error {
-
+    
     ad_return_error "Database error" "A database error occured while trying
 to swap your questions. Here's the error:
 <pre>

www/process-response.tcl

@@ -14,13 +14,11 @@ ad_page_contract {
     @creation-date    28th September 2000
     @cvs-id $Id$
 } {
-
   survey_id:integer,notnull
   { related_object_id:integer "" }
   { related_context_id:integer "" }
   return_url:optional
   response_to_question:array,optional,multiple,html
-
 } -validate {
 	
     survey_exists -requires { survey_id } {