Index: openacs-4/packages/xowiki/www/admin/set-publish-state.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/set-publish-state.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/xowiki/www/admin/set-publish-state.tcl 16 Apr 2007 11:15:10 -0000 1.5 +++ openacs-4/packages/xowiki/www/admin/set-publish-state.tcl 17 Apr 2007 09:30:38 -0000 1.6 @@ -14,15 +14,14 @@ } set item_id [db_string get_item_id \ - {select item_id from cr_revisions - where revision_id = :revision_id}] + {select item_id from cr_revisions where revision_id = :revision_id}] + ns_cache flush xotcl_object_cache ::$item_id ns_cache flush xotcl_object_cache ::$revision_id -#::xo::db::CONTENT_ITEM MAKE_LIVE {revision_id state} -::xo::db::content_item make_live \ +::xo::db::content_item set_live_revision \ -revision_id $revision_id \ - -state $state + -publish_status $state if {$state ne "production"} { ::xowiki::notification::do_notifications -revision_id $revision_id Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/xowiki/www/xinha/file-selector.tcl 16 Apr 2007 11:15:10 -0000 1.7 +++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl 17 Apr 2007 09:30:38 -0000 1.8 @@ -159,7 +159,7 @@ #set folder_path [::xo::db::CONTENT_ITEM GET_PATH {folder_id root_folder_id}] set folder_path [::xo::db::content_item get_path \ - -folder_id $folder_id \ + -item_id $folder_id \ -root_folder_id $root_folder_id] # -pass_to_urls {c}