Index: openacs-4/packages/acs-subsite/www/user/portrait/erase-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/erase-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/user/portrait/erase-2.tcl 10 Jan 2007 21:22:11 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/user/portrait/erase-2.tcl 29 May 2007 05:37:25 -0000 1.5 @@ -24,14 +24,24 @@ ad_require_permission $user_id "write" -db_dml portrait_delete "update cr_items -set live_revision = NULL -where item_id = ( - select object_id_two +set item_id [db_string item_id "select object_id_two from acs_rels where object_id_one = :user_id - and rel_type = 'user_portrait_rel')" + and rel_type = 'user_portrait_rel'"] +set resized_item_id [image::get_resized_item_id -item_id $item_id] + +# Delete the resized version +if {$resized_item_id ne ""} { + content::item::delete -item_id $resized_item_id +} + +# Delete the relationship +db_dml delete_rel "delete from acs_rels where object_id_two = :item_id and object_id_one = :user_id and rel_type = 'user_portrait_rel'" + +# Delete the item +content::item::delete -item_id $item_id + if {$return_url eq ""} { set return_url "/pvt/home" }