Index: openacs-4/packages/download/www/all-metadata.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/all-metadata.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/download/www/all-metadata.tcl 26 Jun 2015 20:56:07 -0000 1.6 +++ openacs-4/packages/download/www/all-metadata.tcl 20 Jan 2018 22:42:17 -0000 1.7 @@ -17,6 +17,7 @@ dam.metadata_id = :metadata_id }] } { ad_return_complaint 1 "Metadata id not found" + ad_script_abort } set answer_column [download_metadata_column $data_type] set metadata_select "metadata$metadata_id" @@ -49,4 +50,4 @@ set url_one_metadata [export_vars -base one-mestada {metadata_id}] } -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/download/www/archive-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add-2.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/download/www/archive-add-2.tcl 26 Jun 2015 20:56:07 -0000 1.8 +++ openacs-4/packages/download/www/archive-add-2.tcl 20 Jan 2018 22:42:17 -0000 1.9 @@ -88,8 +88,11 @@ end; } - download_insert_revision $upload_file ${upload_file.tmpfile} $repository_id $archive_type_id $archive_id $version_name $revision_id $user_id $creation_ip $approved_p [array get metadata] + download_insert_revision $upload_file ${upload_file.tmpfile} $repository_id \ + $archive_type_id $archive_id $version_name $revision_id \ + $user_id $creation_ip $approved_p [array get metadata] } ad_returnredirect $return_url +ad_script_abort Index: openacs-4/packages/download/www/one-metadata.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-metadata.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/download/www/one-metadata.tcl 24 Feb 2005 13:33:12 -0000 1.5 +++ openacs-4/packages/download/www/one-metadata.tcl 20 Jan 2018 22:42:17 -0000 1.6 @@ -16,7 +16,8 @@ where dam.linked_p = 't' and dam.metadata_id = :metadata_id }] } { - ad_return_complaint 1 "[_ download.lt_Metadata_id_not_found]" + ad_return_complaint 1 [_ download.lt_Metadata_id_not_found] + ad_script_abort } set answer_column [download_metadata_column $data_type] Index: openacs-4/packages/download/www/admin/approve-or-reject-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 6 Aug 2014 16:24:41 -0000 1.9 +++ openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 20 Jan 2018 22:42:17 -0000 1.10 @@ -47,7 +47,7 @@ } errmsg]} { ad_return_error "Problem $approval_action version" "There was a problem $approval_action the version in the database. Here's the error message: $errmsg" - return + ad_script_abort } # Everything after here is email related, so let's send the user on their way Index: openacs-4/packages/download/www/admin/export-csv.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/export-csv.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/download/www/admin/export-csv.tcl 1 Mar 2005 00:01:29 -0000 1.3 +++ openacs-4/packages/download/www/admin/export-csv.tcl 20 Jan 2018 22:42:17 -0000 1.4 @@ -1,4 +1,3 @@ -# /packages/download/www/admin/export-csv.tcl ad_page_contract { returns a comma-separated values file where each row is one user in a class (designated by the args); this CSV file is @@ -24,9 +23,16 @@ } if { $count == 0 } { - doc_return 200 text/plain "No users meet your criteria" + doc_return 200 text/plain "No users meet your criteria" } else { - doc_return 200 text/plain $csv_rows + doc_return 200 text/plain $csv_rows } +ad_script_abort +# +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: Index: openacs-4/packages/download/www/admin/repository-metadata-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata-delete.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/repository-metadata-delete.tcl 6 Aug 2014 16:24:41 -0000 1.4 +++ openacs-4/packages/download/www/admin/repository-metadata-delete.tcl 20 Jan 2018 22:42:17 -0000 1.5 @@ -16,4 +16,5 @@ } ad_returnredirect "repository-metadata" +ad_script_abort Index: openacs-4/packages/download/www/admin/repository-reasons-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons-delete.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/repository-reasons-delete.tcl 6 Aug 2014 16:24:41 -0000 1.4 +++ openacs-4/packages/download/www/admin/repository-reasons-delete.tcl 20 Jan 2018 22:42:17 -0000 1.5 @@ -16,4 +16,4 @@ } ad_returnredirect "repository-reasons" - +ad_script_abort Index: openacs-4/packages/download/www/admin/repository-types-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types-delete.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/repository-types-delete.tcl 6 Aug 2014 16:24:41 -0000 1.4 +++ openacs-4/packages/download/www/admin/repository-types-delete.tcl 20 Jan 2018 22:42:17 -0000 1.5 @@ -16,4 +16,5 @@ } ad_returnredirect "repository-types" +ad_script_abort Index: openacs-4/packages/edit-this-page/templates/news-index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/edit-this-page/templates/news-index.adp 3 Jul 2015 11:19:01 -0000 1.6 +++ openacs-4/packages/edit-this-page/templates/news-index.adp 20 Jan 2018 22:42:50 -0000 1.7 @@ -10,7 +10,7 @@ There are no -currentexpired +currentexpired news items @@ -22,7 +22,7 @@ - + If you're looking for an old news article, check the expired news. Index: openacs-4/packages/edit-this-page/www/etp-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-create-2.tcl 27 Jun 2015 20:03:21 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-create-2.tcl 20 Jan 2018 22:42:50 -0000 1.4 @@ -19,3 +19,4 @@ etp::make_page $name $title ad_returnredirect [export_vars -base etp {name}] } +ad_script_abort Index: openacs-4/packages/edit-this-page/www/etp-extlink.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/edit-this-page/www/etp-extlink.tcl 7 Aug 2014 07:39:18 -0000 1.8 +++ openacs-4/packages/edit-this-page/www/etp-extlink.tcl 20 Jan 2018 22:42:50 -0000 1.9 @@ -37,6 +37,7 @@ } } ad_returnredirect "etp" + } ad_script_abort } else { Index: openacs-4/packages/edit-this-page/www/etp-install-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-install-portlet.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-install-portlet.tcl 26 Feb 2005 17:52:21 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-install-portlet.tcl 20 Jan 2018 22:42:50 -0000 1.4 @@ -47,4 +47,5 @@ etp::make_page "index" $title } set fs_package_id [site_node::instantiate_and_mount -parent_node_id $node_id -package_key "file-storage" -package_name "file-storage"] -ad_returnredirect "etp" \ No newline at end of file +ad_returnredirect "etp" +ad_script_abort Index: openacs-4/packages/edit-this-page/www/etp-publish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-publish.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/edit-this-page/www/etp-publish.tcl 27 Jun 2015 20:03:21 -0000 1.3 +++ openacs-4/packages/edit-this-page/www/etp-publish.tcl 20 Jan 2018 22:42:50 -0000 1.4 @@ -29,4 +29,4 @@ } ad_returnredirect [export_vars -base etp {name}] - +ad_script_abort Index: openacs-4/packages/edit-this-page/www/etp-setup-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/edit-this-page/www/etp-setup-2.tcl 27 Jun 2015 20:03:21 -0000 1.6 +++ openacs-4/packages/edit-this-page/www/etp-setup-2.tcl 20 Jan 2018 22:42:50 -0000 1.7 @@ -49,3 +49,4 @@ } ad_returnredirect "etp" +ad_script_abort Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl 27 Jun 2015 20:03:21 -0000 1.7 +++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl 20 Jan 2018 22:42:50 -0000 1.8 @@ -21,6 +21,7 @@ if { $subtopic_name eq "" || [regexp {[^a-zA-Z0-9\-_]} $subtopic_name] } { ad_return_complaint 1 "[_ edit-this-page.The_subtopic_name_must_be_a_short_identifier]" + ad_script_abort } else { set new_package_id [subsite::auto_mount_application \ -instance_name $subtopic_name \ @@ -39,6 +40,7 @@ apm_parameter_sync "edit-this-page" $new_package_id set title $subtopic_title ad_returnredirect [export_vars -base $subtopic_name/etp-setup-2 {title}] + ad_script_abort } ad_script_abort } else { Index: openacs-4/packages/edit-this-page/www/etp-swap.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-swap.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/edit-this-page/www/etp-swap.tcl 24 Sep 2001 17:24:13 -0000 1.1 +++ openacs-4/packages/edit-this-page/www/etp-swap.tcl 20 Jan 2018 22:42:50 -0000 1.2 @@ -43,4 +43,5 @@ } -ad_returnredirect "etp" \ No newline at end of file +ad_returnredirect "etp" +ad_script_abort Index: openacs-4/packages/news/www/item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/news/www/item.tcl 7 Aug 2017 23:48:12 -0000 1.22 +++ openacs-4/packages/news/www/item.tcl 20 Jan 2018 22:43:23 -0000 1.23 @@ -71,6 +71,7 @@ set title [_ news.Error] set contect [list $title] ad_return_complaint 1 [_ news.lt_Could_not_find_the_re] + ad_script_abort } # Local variables: Index: openacs-4/packages/news/www/preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v diff -u -r1.32 -r1.33 --- openacs-4/packages/news/www/preview.tcl 7 Aug 2017 23:48:12 -0000 1.32 +++ openacs-4/packages/news/www/preview.tcl 20 Jan 2018 22:43:23 -0000 1.33 @@ -80,7 +80,8 @@ publish_date(year) publish_date(month) publish_date(day)] || ![regexp $exp $archive_date_ansi match \ archive_date(year) archive_date(month) archive_date(day)] } { - ad_return_complaint 1 "[_ news.Publish_archive_dates_incorrect]" + ad_return_complaint 1 [_ news.Publish_archive_dates_incorrect] + ad_script_abort } } # deal with Dates, granularity is 'day' Index: openacs-4/packages/news/www/admin/revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/news/www/admin/revision.tcl 7 Aug 2017 23:48:12 -0000 1.13 +++ openacs-4/packages/news/www/admin/revision.tcl 20 Jan 2018 22:43:23 -0000 1.14 @@ -44,6 +44,7 @@ } else { ad_return_complaint 1 [_ news.lt_Could_not_find_corres] + ad_script_abort } ad_return_template Index: openacs-4/packages/dotlrn-ecommerce/lib/section.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/section.tcl,v diff -u -r1.41 -r1.42 --- openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 19 Jan 2018 12:59:09 -0000 1.41 +++ openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 20 Jan 2018 22:44:04 -0000 1.42 @@ -157,7 +157,8 @@ # HAM : Let's check if we have InstructorCommunityId enabled and set if { $instructor_community_id == 0 && ![db_0or1row "checkinstructorcommunity" "select community_id from dotlrn_communities where community_id = :instructor_community_id"] } { - ad_return_complaint 1 "Parameter InstructorCommunityId is not set or Community Id does not exist." + ad_return_complaint 1 "Parameter InstructorCommunityId is not set or Community Id does not exist." + ad_script_abort } else { # community_id is valid # list users @@ -177,7 +178,8 @@ # HAM : Let's check if we have AssistantCommunityId enabled and set if { $assistant_community_id == 0 && ![db_0or1row "checkassistantcommunity" "select community_id from dotlrn_communities where community_id = :assistant_community_id"] } { - ad_return_complaint 1 "Parameter AssistantCommunityId is not set or Community Id does not exist." + ad_return_complaint 1 "Parameter AssistantCommunityId is not set or Community Id does not exist." + ad_script_abort } else { # community_id is valid set _assistants [dotlrn_community::list_users $assistant_community_id] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/gwu-section-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/gwu-section-new.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn-ecommerce/www/admin/gwu-section-new.tcl 19 Jan 2018 12:59:10 -0000 1.7 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/gwu-section-new.tcl 20 Jan 2018 22:44:04 -0000 1.8 @@ -40,7 +40,8 @@ # HAM : Let's check if we have InstructorCommunityId enabled and set if { $instructor_community_id == 0 && ![db_0or1row "checkinstructorcommunity" "select community_id from dotlrn_communities where community_id = :instructor_community_id"] } { - ad_return_complaint 1 "Parameter InstructorCommunityId is not set or Community Id does not exist." + ad_return_complaint 1 "Parameter InstructorCommunityId is not set or Community Id does not exist." + ad_script_abort } else { # community_id is valid # list users @@ -59,7 +60,8 @@ # HAM : Let's check if we have AssistantCommunityId enabled and set if { $assistant_community_id == 0 && ![db_0or1row "checkassistantcommunity" "select community_id from dotlrn_communities where community_id = :assistant_community_id"] } { - ad_return_complaint 1 "Parameter AssistantCommunityId is not set or Community Id does not exist." + ad_return_complaint 1 "Parameter AssistantCommunityId is not set or Community Id does not exist." + ad_script_abort } else { # community_id is valid set assistants [dotlrn_community::list_users $assistant_community_id] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl 18 Aug 2005 14:29:40 -0000 1.5 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl 20 Jan 2018 22:44:04 -0000 1.6 @@ -162,5 +162,4 @@
" -#doc_return 200 text/html $doc_body set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl 18 Aug 2005 14:29:40 -0000 1.5 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-3.tcl 20 Jan 2018 22:44:04 -0000 1.6 @@ -298,5 +298,4 @@ " -#doc_return 200 text/html $doc_body -set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] \ No newline at end of file +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl 25 Aug 2005 07:54:48 -0000 1.12 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl 20 Jan 2018 22:44:04 -0000 1.13 @@ -584,5 +584,4 @@ Back to Order Summary  Back to Order $order_id " -#doc_return 200 text/html $doc_body set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/admin/pages/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/pages/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/admin/pages/index.tcl 21 Jul 2005 22:09:39 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/pages/index.tcl 20 Jan 2018 22:44:04 -0000 1.2 @@ -20,7 +20,8 @@ if {$section_package_id == 0} { # ad_returnnotfound # ad_script_abort - ad_return_complaint 1 "section_id '${section_id}' urlv '${urlv}' section_package_id '${section_package_id}'" + ad_return_complaint 1 "section_id '${section_id}' urlv '${urlv}' section_package_id '${section_package_id}'" + ad_script_abort } set section_community_node_id [site_node::get_node_id_from_object_id -object_id $section_package_id] @@ -34,4 +35,4 @@ set context [list $page_title] set return_url [ad_return_url] -ad_return_template \ No newline at end of file +ad_return_template Index: openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-2.tcl 2 Sep 2008 21:54:48 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-2.tcl 20 Jan 2018 22:44:04 -0000 1.2 @@ -162,5 +162,4 @@
" -#doc_return 200 text/html $doc_body set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-3.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-3.tcl 2 Sep 2008 21:54:48 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-3.tcl 20 Jan 2018 22:44:04 -0000 1.2 @@ -298,5 +298,4 @@ " -#doc_return 200 text/html $doc_body -set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] \ No newline at end of file +set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-4.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-4.tcl 2 Sep 2008 21:54:48 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/manage/ecommerce/items-return-4.tcl 20 Jan 2018 22:44:04 -0000 1.2 @@ -584,5 +584,4 @@ Back to Order Summary  Back to Order $order_id " -#doc_return 200 text/html $doc_body set context [list [list index Orders] [list one?order_id=$order_id "One Order"] "Refund"] Index: openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl 7 Aug 2017 23:47:45 -0000 1.4 +++ openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl 20 Jan 2018 22:45:12 -0000 1.5 @@ -26,6 +26,7 @@ if {![apm_version_installed_p $version_id] } { ad_return_complaint 1 "Database Error: The database returned the following error message 
[ns_quotehtml $errmsg]
" + ad_script_abort } } Index: openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl 19 Jan 2018 13:40:40 -0000 1.15 +++ openacs-4/packages/acs-admin/www/apm/version-edit-2.tcl 20 Jan 2018 22:45:12 -0000 1.16 @@ -57,13 +57,15 @@ if { $version_changed_p && $version_uri eq $old_version_uri } { ad_return_complaint 1 {You have changed the version number but not the version URL. When creating a package for a new version, you must select a new URL for the version.} + ad_script_abort } if { $upgrade_p && [db_string apm_version_uri_unique_ck { select decode(count(*), 0, 0, 1) from apm_package_versions where version_uri = :version_uri } -default 0] } { ad_return_complaint 1 "A version with the URL $version_uri already exists." + ad_script_abort } db_transaction { Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 19 Jan 2018 14:09:48 -0000 1.10 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 20 Jan 2018 22:45:12 -0000 1.11 @@ -59,6 +59,7 @@ 
                 [ns_quotehtml $errmsg]
" + ad_script_abort } if {[lsearch $expand $parent_id] == -1} { Index: openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl 7 Aug 2017 23:47:59 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/shared/email-image-bits.tcl 20 Jan 2018 22:45:12 -0000 1.4 @@ -7,8 +7,8 @@ } cr_write_content -revision_id $revision_id +ad_script_abort - # Local variables: # mode: tcl # tcl-indent-level: 4