Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -r1.261 -r1.262 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 6 Apr 2018 16:06:32 -0000 1.261 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 7 Apr 2018 18:03:18 -0000 1.262 @@ -2700,7 +2700,7 @@ #my msg "mul=[:multiple]" # makes only sense currently for multiple selects if {[:multiple] && [:dnd]} { - if {([info exists :disabled] && [:disabled])} { + if {[info exists :disabled] && [:disabled]} { html::t -disableOutputEscaping [:pretty_value [:value]] } else { Index: openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl 7 Aug 2017 23:48:31 -0000 1.8 +++ openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl 7 Apr 2018 18:05:33 -0000 1.9 @@ -11,7 +11,7 @@ return_url:localurl,optional } -if {([info exists package_id] && $package_id ne "")} { +if {[info exists package_id] && $package_id ne ""} { set xowiki_package_id $package_id } elseif {[info exists cf]} { array set config $cf @@ -24,11 +24,11 @@ ::xowiki::Package initialize -package_id $xowiki_package_id set applet_url [::$xowiki_package_id package_url] -if {(![info exists template_portal_id] || $template_portal_id eq "")} { +if {![info exists template_portal_id] || $template_portal_id eq ""} { set template_portal_id [dotlrn_community::get_portal_id] } -if {![info exists referer] && ([info exists return_url] && $return_url ne "")} { +if {![info exists referer] && [info exists return_url] && $return_url ne ""} { set referer $return_url } Index: openacs-4/packages/attachments/www/detach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/detach.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/attachments/www/detach.tcl 20 Jan 2018 22:59:51 -0000 1.6 +++ openacs-4/packages/attachments/www/detach.tcl 7 Apr 2018 18:07:50 -0000 1.7 @@ -72,7 +72,7 @@ } -on_request { } -on_submit { attachments::unattach -object_id $object_id -attachment_id $attachment_id - if {([info exists delete_button] && $delete_button ne "") + if {[info exists delete_button] && $delete_button ne "" && !$attached_to_other_objects_n } { fs::delete_file -item_id $attachment_id