Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -N -r1.221 -r1.222
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	7 Apr 2018 18:00:33 -0000	1.221
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	8 Apr 2018 05:13:01 -0000	1.222
@@ -2330,7 +2330,7 @@
                 # user %varname% to substitute variables in email
                 set subject_vars [lang::message::get_embedded_vars $subject]
                 set email_vars [lang::message::get_embedded_vars $email]
-                foreach var [concat $subject_vars $email_vars] {
+                foreach var [list {*}$subject_vars {*}$email_vars] {
                     if {![info exists vars($var)]} {
                         set vars($var) ""
                     }
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	7 Aug 2017 23:48:09 -0000	1.22
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	8 Apr 2018 05:13:01 -0000	1.23
@@ -24,19 +24,19 @@
 } {
 }
 
-if {(![info exists show_buttons_p] || $show_buttons_p eq "")} {
+if {![info exists show_buttons_p] || $show_buttons_p eq ""} {
     set show_buttons_p 0
 }
 
-if {(![info exists show_archived_p] || $show_archived_p eq "")} {
+if {![info exists show_archived_p] || $show_archived_p eq ""} {
     set show_archived_p 0
 }
 
 #DRB: This is a hack that depends on .LRN having clubs and classes.  Done quickly for
 #theme-selva for .LRN 2.2.
 
 set community_type_clause ""
-if { ([info exists community_filter] && $community_filter ne "") } {
+if { [info exists community_filter] && $community_filter ne "" } {
     set show_subtitle_p 0
     if { $community_filter eq "class_instances" } {
         set community_type_clause "and dotlrn_communities_all.community_type not in ('dotlrn_community', 'dotlrn_club', 'dotlrn_pers_community')"
@@ -79,17 +79,18 @@
         set base_level $tree_level
         set new_type_p 1
     }
-    if { [info exists old_simple_community_type] &&
-         $old_simple_community_type ne $simple_community_type } {
+    if { [info exists old_simple_community_type]
+         && $old_simple_community_type ne $simple_community_type
+     } {
         append previous_type_ul_tags [string repeat "</li></ul>" $old_depth]
         set old_depth 0
     }
 
     set depth [expr {$tree_level - $base_level}]
     if { $depth > $old_depth } {
         append intra_type_ul_tags [string repeat "<ul><li>" [expr {$depth - $old_depth}]]
-    }
-    if { $old_depth > $depth } {
+
+    } elseif { $old_depth > $depth } {
         append intra_type_ul_tags [string repeat "</li></ul>" [expr {$old_depth - $depth}]]
         append intra_type_ul_tags "</li><li>"
     }
Index: openacs-4/packages/dotlrn/www/register-link.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register-link.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/register-link.tcl	7 Aug 2017 23:48:09 -0000	1.4
+++ openacs-4/packages/dotlrn/www/register-link.tcl	8 Apr 2018 05:13:01 -0000	1.5
@@ -14,19 +14,19 @@
 } -errors {
 }
 
-if { (![info exists url] || $url eq "") } {
+if { ![info exists url] || $url eq "" } {
     set base_url "register"
 } else {
     set base_url $url
 }
 
-if { ([info exists referer] && $referer ne "") } {
-    set url "[export_vars -base $base_url {community_id}]&referer=$referer"
+if { [info exists referer] && $referer ne "" } {
+    set url [export_vars -base $base_url {community_id referer}]
 } else {
     set url [export_vars -base $base_url {community_id}]
 }
     
-if { (![info exists label] || $label eq "") } {
+if { ![info exists label] || $label eq "" } {
     set label [_ dotlrn.Join]
 }
 
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	7 Aug 2017 23:48:09 -0000	1.14
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	8 Apr 2018 05:13:01 -0000	1.15
@@ -69,7 +69,7 @@
     set page_query select_classes_by_department_paginator
 }
 
-if { ([info exists keyword] && $keyword ne "") } {
+if { [info exists keyword] && $keyword ne "" } {
     set keyword_clause [db_map classes_keyword]
 } else {
     set keyword_clause ""
@@ -86,7 +86,10 @@
 set actions ""
 
 if { $can_create } {
-    set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]" "[_ dotlrn.new_class_1]"]
+    set actions [list \
+                     [_ dotlrn.new_class_1] \
+                     [export_vars -base "class-new" -url { department_key referer }] \
+                     [_ dotlrn.new_class_1]]
 }
 
 template::list::create \
Index: openacs-4/packages/dotlrn/www/admin/unarchive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/unarchive.tcl,v
diff -u -N -r1.6 -r1.7
Binary files differ