Index: openacs-4/packages/categories/lib/contributions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/contributions.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/categories/lib/contributions.tcl	15 May 2007 20:14:23 -0000	1.2
+++ openacs-4/packages/categories/lib/contributions.tcl	6 Oct 2007 13:48:29 -0000	1.3
@@ -57,7 +57,7 @@
 #    html {align right}
 #}
 
-if {[empty_string_p $user_id]} {
+if {$user_id eq ""} {
     lappend elements name {
         label {Created by}
         display_template {<a href="@content.user_url@" title="Member page">@content.name@</a>}
@@ -108,15 +108,15 @@
 
 set restrict {}
 
-if {![empty_string_p $user_id]} {
+if {$user_id ne ""} {
     append restrict "\nand o.creation_user = :user_id"
 }
 
-if {![empty_string_p $category]} {
+if {$category ne ""} {
     append restrict "\nand exists (select 1 from category_object_map c where c.object_id = o.object_id and c.category_id = :category)"
 }
 
-if {![empty_string_p $packages]} {
+if {$packages ne ""} {
     append restrict "\nand o.package_id in ([join $packages ,])"
 }
 
Index: openacs-4/packages/categories/tcl/category-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-form-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/categories/tcl/category-form-procs.tcl	28 Aug 2007 16:30:03 -0000	1.5
+++ openacs-4/packages/categories/tcl/category-form-procs.tcl	6 Oct 2007 13:48:29 -0000	1.6
@@ -4,7 +4,7 @@
     @author Branimir Dolicki (bdolicki@branimir.com)
 
     @creation-date 06 February 2004
-    @cvs-id $Id:
+    @cvs-id $Id$
 }
 
 namespace eval category::ad_form {}
Index: openacs-4/packages/categories/www/include/widget.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/include/widget.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/categories/www/include/widget.tcl	12 Feb 2004 14:28:44 -0000	1.5
+++ openacs-4/packages/categories/www/include/widget.tcl	6 Oct 2007 13:48:29 -0000	1.6
@@ -23,7 +23,7 @@
 	util_unlist $category category_id category_name deprecated_p level
 	set indent ""
 	if {$level>1} {
-	    set indent "[string repeat "&nbsp;" [expr 2*$level -4]].."
+	    set indent "[string repeat "&nbsp;" [expr {2*$level -4}]].."
 	}
 	set selected_p [info exists mapped($category_id)]