Index: openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/upload-2.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl 15 Dec 2006 17:25:30 -0000 1.13 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload-2.tcl 10 Jan 2007 21:22:11 -0000 1.14 @@ -15,7 +15,7 @@ subsite::upload_allowed set current_user_id [auth::require_login] -if [empty_string_p $user_id] { +if {$user_id eq ""} { set user_id $current_user_id } @@ -25,7 +25,7 @@ set exception_count 0 if {![info exists upload_file] - || [empty_string_p $upload_file] + || $upload_file eq "" } { append exception_text "
  • Please specify a file to upload
  • \n" incr exception_count @@ -78,7 +78,7 @@ db_transaction { set item_id [content::item::get_id_by_name -name "portrait-of-user-$user_id" -parent_id $user_id] - if { [empty_string_p $item_id]} { + if { $item_id eq ""} { # The user doesn't have a portrait relation yet set item_id [content::item::new -name "portrait-of-user-$user_id" -parent_id $user_id -content_type image] } @@ -100,7 +100,7 @@ content::item::set_live_revision -revision_id $revision_id # Only create the new relationship if there does not exist one already set user_portrait_rel_id [relation::get_id -object_id_one $user_id -object_id_two $item_id -rel_type "user_portrait_rel"] - if {[empty_string_p $user_portrait_rel_id]} { + if {$user_portrait_rel_id eq ""} { db_exec_plsql create_rel {} } }