Index: openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl	2 Feb 2010 14:24:34 -0000	1.5
+++ openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.tcl	23 Apr 2018 15:35:00 -0000	1.6
@@ -12,7 +12,7 @@
     {export ""}
     {sort_by ""}
 } -properties {
-    
+
 } -validate {
     valid_date -requires { date } {
         if {![string equal $date ""]} {
@@ -24,14 +24,14 @@
 }
 
 # Note that the variable calendar_id is a list of all calendar_id parameter values set for
-# this layout element.  
+# this layout element.
 
 set private_calendar_id [calendar_includelet::get_private_calendar_id \
                         -user_id [ad_conn user_id] \
                         -package_id $package_id]
 lappend calendar_id $private_calendar_id
 
-if {[empty_string_p $view]} {
+if { $view eq "" } {
     set view $default_view
 }
 
@@ -65,7 +65,7 @@
 set admin_p [permission::permission_p -object_id $package_id -privilege admin]
 
 # set up some vars
-if {[empty_string_p $date]} {
+if { $date eq "" } {
     set date [dt_sysdate]
 }
 
@@ -98,4 +98,4 @@
     ad_script_abort
 }
 
-ad_return_template 
+ad_return_template
Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	12 Sep 2008 16:16:44 -0000	1.5
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.tcl	23 Apr 2018 15:35:00 -0000	1.6
@@ -11,10 +11,10 @@
     {julian_date ""}
     {sort_by ""}
 } -properties {
-    
+
 }  -validate {
     valid_date -requires { date } {
-        if {![string equal $date ""]} {
+        if {$date ne ""} {
             if {[catch {set date [clock format [clock scan $date] -format "%Y-%m-%d"]} err]} {
                 ad_complain "Your input ($date) was not valid. It has to be in the form YYYYMMDD."
             }
@@ -26,8 +26,8 @@
 set return_url "[ns_conn url]?[ns_conn query]"
 
 # set up some vars
-if {[empty_string_p $date]} {
-    if {[empty_string_p $julian_date]} {
+if {$date eq ""} {
+    if {$julian_date eq ""} {
         set date [dt_sysdate]
     } else {
         set date [db_string select_from_julian "select to_date(:julian_date ,'J') from dual"]
@@ -47,7 +47,7 @@
 }
 
 # Note that the variable calendar_id is a list of all calendar_id parameter values set for
-# this layout element.  
+# this layout element.
 
 set private_calendar_id [calendar_includelet::get_private_calendar_id \
                         -user_id [ad_conn user_id] \