Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v diff -u -r1.19.2.4 -r1.19.2.5 --- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 2 Dec 2005 08:36:28 -0000 1.19.2.4 +++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 26 Apr 2006 09:16:54 -0000 1.19.2.5 @@ -30,12 +30,14 @@ set package_id [ad_conn package_id] } +set entry_id $blog(entry_id) + if { ![exists_and_not_null return_url] } { # IMPORTANT: I changed the return_url here since ad_return_url also add the variables # for the sw_category_id, year, month and day and this are already take in care in # the indext.vuh file, ad_conn url returns only the URL without the variables # set return_url [ad_return_url] - set return_url [ad_conn url] + set return_url [export_vars -base "[ad_conn url]" -url {entry_id}] } if { ![exists_and_not_null screen_name] } { @@ -54,8 +56,6 @@ set show_poster_p [ad_parameter "ShowPosterP" "" "1"] -set entry_id $blog(entry_id) - lars_blogger::entry::htmlify \ -max_content_length $max_content_length \ -more [ad_decode [ad_return_url] $blog(permalink_url) {} " Continued..."] \ Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v diff -u -r1.21.2.3 -r1.21.2.4 --- openacs-4/packages/lars-blogger/www/entry-edit.tcl 20 Apr 2005 14:27:43 -0000 1.21.2.3 +++ openacs-4/packages/lars-blogger/www/entry-edit.tcl 26 Apr 2006 09:16:54 -0000 1.21.2.4 @@ -43,7 +43,6 @@ } } - set package_id [ad_conn package_id] set now_ansi [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S"] @@ -160,7 +159,7 @@ set category_ids [category::ad_form::get_categories \ -container_object_id $container_id] - } \ + } \ -new_data { lars_blogger::entry::new \ -entry_id $entry_id \ @@ -198,21 +197,13 @@ $category_ids } \ -after_submit { + if {"$draft_p" == "t"} { ad_returnredirect one-entry?[export_url_vars entry_id] } else { ad_returnredirect $return_url } ad_script_abort - } \ - -validate {{ - title_url - {[ - expr {[empty_string_p $title_url] || \ - [util_url_valid_p $title_url] - } - ]} - "[_ lars-blogger.lt_Your_input_title_url_]" - }} + } set context [list $page_title]