Index: openacs-4/packages/xowiki/www/admin/import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v diff -u -r1.28.2.9 -r1.28.2.10 --- openacs-4/packages/xowiki/www/admin/import.tcl 23 Mar 2022 08:33:32 -0000 1.28.2.9 +++ openacs-4/packages/xowiki/www/admin/import.tcl 23 Mar 2022 09:03:41 -0000 1.28.2.10 @@ -11,26 +11,14 @@ {-return_url:localurl ../} {-parent_id:object_id 0} } - if {$parent_id ne 0} { - set success 0 - try { - ::xo::db::CrClass get_instance_from_db -item_id $parent_id - } on ok {parentObj} { - if {[$parentObj package_id] == $package_id} { - set success 1 - } - } on error {errorMsg} { - ns_log warning "import.tcl sees invalid parent_id '$parent_id'" - } - if {!$success} { + set success [::xo::db::CrClass id_belongs_to_package -item_id $parent_id -package_id $package_id] + if {!$success} { ad_return_complaint 1 "provided parent_id is invalid" - ns_log notice STILL ad_script_abort } } - set msg "" ad_form \ -name upload_form \