Index: openacs-4/packages/categories/www/cadmin/category-phase-in.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-in.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	9 Feb 2004 19:48:44 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	11 Feb 2004 10:28:02 -0000	1.4
@@ -1,5 +1,5 @@
 ad_page_contract {
-    Phases a category in/out.
+    Reactivates deprecated categories.
 
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
Index: openacs-4/packages/categories/www/cadmin/category-phase-out.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-out.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	9 Feb 2004 19:48:44 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	11 Feb 2004 10:28:02 -0000	1.5
@@ -1,32 +1,22 @@
 ad_page_contract {
-    Phases a category in/out.
+    Deprecates categories.
 
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
     tree_id:integer
     category_id:integer,multiple
-    {phase_out_p:integer 1}
     {locale ""}
     object_id:integer,optional
 } 
 
 permission::require_permission -object_id $tree_id -privilege category_tree_write
 
-if { $phase_out_p } {
-    db_transaction {
-	foreach id $category_id {
-	    category::phase_out $id
-	}
+db_transaction {
+    foreach id $category_id {
+	category::phase_out $id
     }
-    category_tree::flush_cache $tree_id
-} else {
-    db_transaction {
-	foreach id $category_id {
-	    category::phase_in $id
-	}
-    }
-    category_tree::flush_cache $tree_id
 }
+category_tree::flush_cache $tree_id
 
 ad_returnredirect [export_vars -no_empty -base tree-view { tree_id locale object_id }]
Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/tree-view.tcl	11 Feb 2004 10:01:11 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/tree-view.tcl	11 Feb 2004 10:28:02 -0000	1.8
@@ -66,9 +66,9 @@
 	set parent_url [export_vars -no_empty -base category-parent-change { category_id tree_id locale object_id }]
 	set links_view_url [export_vars -no_empty -base category-links-view { category_id tree_id locale object_id }]
 	if { [template::util::is_true $deprecated_p] } {
-	    set phase_in_url [export_vars -no_empty -base category-phase-out { category_id { phase_out_p 0 } tree_id locale object_id }]
+	    set phase_in_url [export_vars -no_empty -base category-phase-in { category_id tree_id locale object_id }]
 	} else {
-	    set phase_out_url [export_vars -no_empty -base category-phase-out { category_id { phase_out_p 1 } tree_id locale object_id }]
+	    set phase_out_url [export_vars -no_empty -base category-phase-out { category_id tree_id locale object_id }]
 	}
     }
 }