Index: openacs-4/packages/dotlrn/tcl/applets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/applets-procs.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn/tcl/applets-procs.tcl	1 Nov 2013 21:08:30 -0000	1.24
+++ openacs-4/packages/dotlrn/tcl/applets-procs.tcl	1 Nov 2013 21:54:12 -0000	1.25
@@ -65,7 +65,7 @@
         proc to tell dotlrn to register and/or activate itself. This _must_
         be able to be run multiple times!
     } {
-        if {![empty_string_p [get_applet_id_from_key -applet_key $applet_key]]} {
+        if {[get_applet_id_from_key -applet_key $applet_key] ne ""} {
             return
         }
 
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 -r1.207 -r1.208
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	1 Nov 2013 21:08:30 -0000	1.207
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	1 Nov 2013 21:54:12 -0000	1.208
@@ -1165,7 +1165,7 @@
     } {
         Returns 1 if the community is a subcommunity, else 0
     } {
-        if {[empty_string_p [get_parent_id -community_id $community_id]]} {
+        if {[get_parent_id -community_id $community_id] eq ""} {
             return 0
         } else {
             return 1
@@ -2128,7 +2128,7 @@
         # acs_attribute_values.attr_value column does not have a "not null"
         # constraint but we will enforce it via our api. if someone circumvents
         # our api then they can die and rot in hell.
-        if {[empty_string_p [get_attribute -community_id $community_id -attribute_name $attribute_name]]} {
+        if {[get_attribute -community_id $community_id -attribute_name $attribute_name] eq ""} {
             db_dml insert_attribute {}
         } else {
             db_dml update_attribute_value {}
@@ -2195,7 +2195,7 @@
     } {
         set valid_p 0
 
-        if {![empty_string_p [get_attribute_id -attribute_name $attribute_name]]} {
+        if {[get_attribute_id -attribute_name $attribute_name] ne ""} {
             set valid_p 1
         }
 
Index: openacs-4/packages/dotlrn/www/community-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn/www/community-edit-2.tcl	1 Nov 2013 21:08:31 -0000	1.20
+++ openacs-4/packages/dotlrn/www/community-edit-2.tcl	1 Nov 2013 21:54:12 -0000	1.21
@@ -72,12 +72,13 @@
 # in the CR root folder (-100).
 set logo_name "community_logo_$community_id"
 
-if { ![empty_string_p [parameter::get -parameter MaximumFileSize]] 
-       && $tmp_size > 0
-      && $tmp_size > [parameter::get -parameter MaximumFileSize] } {
-
+set maxFileSize [parameter::get -parameter MaximumFileSize]
+if { $maxFileSize ne "" 
+     && $tmp_size > 0
+     && $tmp_size > $maxFileSize 
+ } {
     set msg_subst_list [list system_name [ad_system_name] \
-                             max_attachments_bytes [util_commify_number [parameter::get -parameter MaximumFileSize]]]
+                             max_attachments_bytes [util_commify_number $maxFileSize]]
     ad_return_complaint 1 "<li>[_ dotlrn.your_icon_is_too_large $msg_subst_list]"
     ad_script_abort
 }
Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl	1 Nov 2013 21:08:31 -0000	1.7
+++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl	1 Nov 2013 21:54:13 -0000	1.8
@@ -161,7 +161,7 @@
     set title [ad_system_name]
 }
 
-if {[empty_string_p [dotlrn_community::get_parent_community_id -package_id [ad_conn package_id]]]} {
+if {[dotlrn_community::get_parent_community_id -package_id [ad_conn package_id]] eq ""} {
     set parent_comm_p 0
 } else {
     set parent_comm_p 1
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	1 Nov 2013 21:08:31 -0000	1.42
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	1 Nov 2013 21:54:13 -0000	1.43
@@ -172,7 +172,7 @@
     set title [ad_system_name]
 }
 
-if {[empty_string_p [dotlrn_community::get_parent_community_id -package_id [ad_conn package_id]]]} {
+if {[dotlrn_community::get_parent_community_id -package_id [ad_conn package_id]] eq ""} {
     set parent_comm_p 0
 } else {
     set parent_comm_p 1