Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 3 Sep 2006 23:05:51 -0000 1.12 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 12 Sep 2006 12:04:36 -0000 1.13 @@ -76,18 +76,20 @@ set return_url [my query_parameter return_url] } - if {[$package_id get_parameter "use_notifications" 1]} { if {[::xo::cc user_id] != 0} { ;# notifications require login - set notification_type [notification::type::get_type_id -short_name xowiki_notif] + set notification_type [notification::type::get_type_id \ + -short_name xowiki_notif] set notification_text "Subscribe the XoWiki instance" - set notification_subscribe_link [export_vars -base /notifications/request-new \ - {return_url - {pretty_name $notification_text} - {type_id $notification_type} - {object_id $package_id}}] - set notification_image "$notification_text" + set notification_subscribe_link \ + [export_vars -base /notifications/request-new \ + {return_url + {pretty_name $notification_text} + {type_id $notification_type} + {object_id $package_id}}] + set notification_image \ + "$notification_text" } } my log "--after notifications [info exists notification_image]" @@ -225,8 +227,9 @@ } #my log "--u sumit_link=$submit_link qp=[my query_parameter return_url]" - # we have to do template mangling here; ad_form_template writes form variables into the - # actual parselevel, so we have to be in our own level in order to access an pass these + # we have to do template mangling here; ad_form_template writes form + # variables into the actual parselevel, so we have to be in our + # own level in order to access an pass these variable ::template::parse_level lappend parse_level [info level] set action_vars [expr {$new ? "{edit-new 1} object_type return_url" : "{m edit} return_url"}] @@ -282,15 +285,14 @@ } } - Page instproc make-live-revision {} { my instvar revision_id item_id package_id my log "--M set_live_revision($revision_id)" db_exec_plsql make_live {select content_item__set_live_revision(:revision_id)} set page_id [my query_parameter "page_id"] ns_cache flush xotcl_object_cache ::$item_id ad_returnredirect [my query_parameter "return_url" \ - [export_vars -base [$package_id url] {{m revisions}}]] + [export_vars -base [$package_id url] {{m revisions}}]] } @@ -301,7 +303,7 @@ ns_cache flush xotcl_object_cache ::$item_id ns_cache flush xotcl_object_cache ::$revision_id ad_returnredirect [my query_parameter "return_url" \ - [export_vars -base [$package_id url] {{m revisions}}]] + [export_vars -base [$package_id url] {{m revisions}}]] } Page instproc delete {} {