Index: openacs-4/packages/theme-selva/www/selva-site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/theme-selva/www/selva-site-master.tcl	4 Jan 2008 18:47:18 -0000	1.8
+++ openacs-4/packages/theme-selva/www/selva-site-master.tcl	28 Jun 2015 13:01:06 -0000	1.9
@@ -19,9 +19,9 @@
 # class parent.  A top-level community that's not a class or club will keep the
 # top-level Selva colors.
 
-if { [string match /dotlrn/clubs/* [ad_conn url]] } {
+if { [string match "/dotlrn/clubs/*" [ad_conn url]] } {
     set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "communityCssUrl" -default "/resources/theme-selva/Selva/turquoise/Selva.css"]
-} elseif { [string match /dotlrn/classes/* [ad_conn url]] } {
+} elseif { [string match "/dotlrn/classes/*" [ad_conn url]] } {
     set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "courseCssUrl" -default "/resources/theme-selva/Selva/green/Selva.css"]
 } else {
     set css_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "cssUrl" -default "/resources/theme-selva/Selva/default/Selva.css"]
@@ -30,7 +30,7 @@
 # Get system name
 set system_name [ad_system_name]
 set system_url [ad_url]
-if { [string equal [ad_conn url] "/"] } {
+if {[ad_conn url] eq "/"} {
     set system_url ""
 }
 
@@ -42,7 +42,7 @@
     set user_name [person::name -person_id $untrusted_user_id]
     set pvt_home_url [ad_pvt_home]
     set pvt_home_name [ad_pvt_home_name]
-    if [empty_string_p $pvt_home_name] {
+    if {$pvt_home_name eq ""} {
 	set pvt_home_name [_ acs-subsite.Your_Account]
     }
     set logout_url [ad_get_logout_url]
@@ -85,12 +85,11 @@
 # change locale
 set num_of_locales [llength [lang::system::get_locales]]
 if { $num_of_locales > 1 } {
-    set change_locale_url \
-        "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
+    set change_locale_url [export_vars -base /acs-lang { { package_id "[ad_conn package_id]" } }]
 }
 
 # Curriculum bar
-if { [empty_string_p [site_node::get_package_url -package_key curriculum]] } {
+if { [site_node::get_package_url -package_key curriculum] eq "" } {
     set curriculum_bar_p 0
 } else {
     set curriculum_bar_p 1