Index: openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl,v
diff -u -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	13 Mar 2019 09:41:26 -0000	1.12.2.2
+++ openacs-4/packages/acs-admin/www/apm/version-callback-add-edit.tcl	30 Mar 2019 19:59:52 -0000	1.12.2.3
@@ -39,7 +39,11 @@
     set page_title "Edit Tcl Callback"
 }
 
-set context [list [list "." "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] [list $return_url "Tcl Callbacks"] $page_title]
+set context [list \
+                 [list "." "Package Manager"] \
+                 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
+                 [list $return_url "Tcl Callbacks"] \
+                 $page_title]
 
 set type_label "Tcl procedure name"
 ad_form -name callback -cancel_url $return_url -form {
@@ -69,12 +73,12 @@
 
 } -validate {
     {proc
-	{ {info commands ::$proc} ne "" }
-	{The specified procedure name does not exist. Is the -procs.tcl file loaded?}
+        { {info commands ::$proc} ne "" }
+        {The specified procedure name does not exist. Is the -procs.tcl file loaded?}
     }
     {proc
-	{ [apm_callback_has_valid_args -type $type -proc_name $proc] }
-	{The callback proc $proc must be defined with ad_proc [expr {[apm_arg_names_for_callback_type -type $type] eq "" ?
+        { [apm_callback_has_valid_args -type $type -proc_name $proc] }
+        {The callback proc $proc must be defined with ad_proc [expr {[apm_arg_names_for_callback_type -type $type] eq "" ?
                                                                      "and should take no arguments" :
                                                                      "and have the following required switches: [apm_arg_names_for_callback_type -type $type]"}]}
     }
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.39 -r1.39.2.1
--- openacs-4/packages/dotlrn/www/members.tcl	29 Jun 2018 17:27:19 -0000	1.39
+++ openacs-4/packages/dotlrn/www/members.tcl	30 Mar 2019 20:02:25 -0000	1.39.2.1
@@ -64,7 +64,7 @@
 
 if {$admin_p && !$csv_p} {
     set bulk_actions [list "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"]
-    set bulk_actions_export_vars [list "user_id" "referer" "reset"]
+    set bulk_actions_export_vars {user_id referer reset}
 
     if { !$subcomm_p } {
         lappend actions \
@@ -80,7 +80,7 @@
     lappend actions "CSV" "members?csv=yes" [_ dotlrn.Export_members_list_to_CSV]
 
     foreach role $rel_types {
-        set action_label "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" 
+        set action_label "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]"
         lappend actions  $action_label "member-confirm?reset=1&reltype=[lindex $role 0]" $action_label
     }
 }
@@ -113,7 +113,7 @@
     } role {
         label "[_ dotlrn.Role]"
         html "align left"
-    } 
+    }
 }
 
 if {$admin_p && !$csv_p} {
@@ -122,7 +122,7 @@
         html "align left"
         display_template {
             <if @members.user_id@ ne \"\">
-            <a href="member-confirm?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> | 
+            <a href="member-confirm?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> |
             <a href="member-add-2?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
             </if>
         }