Index: openacs.org-dev/packages/bookmarks/www/bookmark-add-one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs.org-dev/packages/bookmarks/www/bookmark-add-one.tcl,v diff -u -r1.1.1.1 -r1.1.1.2 --- openacs.org-dev/packages/bookmarks/www/bookmark-add-one.tcl 9 Jul 2002 17:35:01 -0000 1.1.1.1 +++ openacs.org-dev/packages/bookmarks/www/bookmark-add-one.tcl 8 Oct 2002 15:46:56 -0000 1.1.1.2 @@ -15,7 +15,7 @@ in December 2000. @creation-date December 2000 - @cvs-id $Id: + @cvs-id $Id$ } { {viewed_user_id:integer ""} {complete_url:trim ""} @@ -72,7 +72,7 @@ } -properties { page_title:onevalue - context_bar_args:onevalue + context:onevalue errmsg:onevalue local_title:onevalue complete_url:onevalue @@ -110,14 +110,14 @@ set user_id [ad_conn user_id] if { $user_id == "0" } { ad_returnredirect "/register/?return_url=$this_url_urlenc" - return + ad_script_abort } set page_title "Inserting \"[string trim $local_title]\"" -set context_bar_args [bm_context_bar_args "\[list bookmark-add-import?[export_url_vars return_url viewed_user_id] \"Add/Import Bookmarks\"\] \"[ad_quotehtml $page_title]\"" $viewed_user_id] +set context [bm_context_bar_args "\[list bookmark-add-import?[export_url_vars return_url viewed_user_id] \"Add/Import Bookmarks\"\] \"[ad_quotehtml $page_title]\"" $viewed_user_id] set meta_description [bm_get_html_description $url_content] set meta_keywords [bm_get_html_keywords $url_content] @@ -128,11 +128,12 @@ # ask for a confirmation if { $url_unreachable_p == "f" && $user_provided_title_p == "t"} { ad_returnredirect "bookmark-add-one-2?[export_url_vars return_url local_title complete_url bookmark_id meta_description meta_keywords url_title viewed_user_id parent_id]" - return -} else { - ad_return_template -} + ad_script_abort +} + +ad_return_template +