Index: openacs-4/packages/news-aggregator/www/aggregator-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator-delete.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- openacs-4/packages/news-aggregator/www/aggregator-delete.tcl	20 Mar 2004 11:04:39 -0000	1.1.1.1
+++ openacs-4/packages/news-aggregator/www/aggregator-delete.tcl	28 Dec 2005 17:55:43 -0000	1.1.1.1.2.1
@@ -11,20 +11,23 @@
     -privilege write
 
 set user_id [ad_conn user_id]
-set default_aggregator [db_string find_default {}]
+set package_id [ad_conn package_id]
+set default_aggregator [news_aggregator::aggregator::user_default -user_id $user_id \
+			    -package_id $package_id]
 
 if { [string equal $delete_aggregator_id $default_aggregator] } {
     # We are deleting the user's default aggregator
     # Set user's oldest aggregator as new default
     set new_default_aggregator [db_string select_oldest_aggregator {} -default ""]
-    if { [exists_and_not_null $new_default_aggregator] } {
+    if { [exists_and_not_null new_default_aggregator] } {
         news_aggregator::aggregator::set_user_default \
             -user_id $user_id \
+	    -package_id $package_id \
             -aggregator_id $new_default_aggregator
     }
 }
 
 news_aggregator::aggregator::delete \
     -aggregator_id $delete_aggregator_id
 
-ad_returnredirect [ad_conn package_url]settings
+ad_returnredirect ./settings