Index: openacs-4/packages/xowiki/tcl/category-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v diff -u -N -r1.31 -r1.31.2.1 --- openacs-4/packages/xowiki/tcl/category-procs.tcl 3 Nov 2018 18:59:55 -0000 1.31 +++ openacs-4/packages/xowiki/tcl/category-procs.tcl 26 Aug 2020 18:33:11 -0000 1.31.2.1 @@ -9,13 +9,13 @@ namespace eval ::xowiki { # # Commonly used code for categories - # + # Class create Category Category proc get_mapped_trees { -object_id - {-locale ""} - {-names ""} - {-output {tree_id tree_name subtree_category_id assign_single_p require_category_p}} + {-locale ""} + {-names ""} + {-output {tree_id tree_name subtree_category_id assign_single_p require_category_p}} } { # Return matched category trees matching the specified names (or all) @@ -71,7 +71,7 @@ } } -::xo::library source_dependent +::xo::library source_dependent # Local variables: Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v diff -u -N -r1.19.2.9 -r1.19.2.10 --- openacs-4/packages/xowiki/tcl/menu-procs.tcl 26 Aug 2020 11:16:11 -0000 1.19.2.9 +++ openacs-4/packages/xowiki/tcl/menu-procs.tcl 26 Aug 2020 18:33:11 -0000 1.19.2.10 @@ -255,10 +255,10 @@ [::$package_id make_form_link -form en:import-archive.form \ -parent_id ${:parent_id}] } - + :add_menu_item -name Package.Startpage -item [list url $folder_link] :add_menu_item -name Package.Toc -item [list url $index_link] - + if {[::$package_id get_parameter "with_notifications" 1]} { if {[::xo::cc user_id] != 0} { # @@ -277,9 +277,9 @@ -item [list url /notifications/manage] } } - + :add_menu_item -name Package.Admin \ - -item [list text #xowiki.admin# url $admin_link] + -item [list text #xowiki.admin# url $admin_link] :add_menu_item -name Package.ImportDump -item [list url $import_link] :add_menu_item -name Package.ImportArchive -item [list url $import_archive_link] } @@ -481,15 +481,15 @@ {*}[${:current_folder} property extra_menu_entries]] :log "config=$config DONE menu_entries=$menu_entries" - + foreach me $menu_entries { set kind [lindex $me 0] if {[string index $kind 0] eq "#"} continue #:log notice "menu_entry <$kind> full <$me>" set properties [lrange $me 1 end] - + switch -- $kind { - + clear_menu { :clear_menu -menu [dict get $properties -menu] } Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v diff -u -N -r1.78 -r1.78.2.1 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 26 Jun 2018 10:25:30 -0000 1.78 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 26 Aug 2020 18:33:11 -0000 1.78.2.1 @@ -18,8 +18,8 @@ ::xowiki::sc::unregister_implementations ::xowiki::notifications-uninstall - # Unregister all types from all folders - ::xowiki::Page folder_type_unregister_all + # Unregister all types from all folders + ::xowiki::Page folder_type_unregister_all # Delete object types foreach type [::xowiki::Page object_types -subtypes_first true] { @@ -32,7 +32,7 @@ {-package_id:required} } { Callback to be called whenever a package instance is deleted. - + @author Gustaf Neumann } { ns_log notice "Executing before-uninstantiate" @@ -48,13 +48,13 @@ ::xo::db::sql::content_item delete -item_id $root_folder_id } } - + set instance_name [apm_instance_name_from_id $package_id] - + ::xo::xotcl_package_cache flush package_id-$instance_name ::xo::xotcl_package_cache flush package_key-$package_id ::xo::xotcl_package_cache flush root_folder-$package_id - ::xo::xotcl_object_type_cache flush -partition_key -100 -100-$instance_name + ::xo::xotcl_object_type_cache flush -partition_key -100 -100-$instance_name ns_log notice "before-uninstantiate DONE" } @@ -65,7 +65,7 @@ } { Deletes the messages of general comments to allow one to uninstantiate the package without violating constraints. - + @author Gustaf Neumann } { set comment_ids [::xo::dc list get_comments { @@ -109,7 +109,7 @@ rename __upgrade "" } } -::xo::library source_dependent +::xo::library source_dependent # # Local variables: