Index: openacs-4/packages/categories/sql/postgresql/category-tree-package.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/category-tree-package.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/categories/sql/postgresql/category-tree-package.sql	30 Jan 2009 02:59:51 -0000	1.12
+++ openacs-4/packages/categories/sql/postgresql/category-tree-package.sql	1 Feb 2009 18:38:02 -0000	1.13
@@ -217,7 +217,7 @@
 	update categories
 	set parent_id = (select t.category_id
 			from categories s, categories t
-			where s.category_id = c.parent_id
+			where s.category_id = categories.parent_id
 			and t.tree_id = p_dest_tree
 			and s.left_ind + v_new_left_ind = t.left_ind)
 	where tree_id = p_dest_tree;
Index: openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1.2d3-1.1.2d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1.2d3-1.1.2d4.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1.2d3-1.1.2d4.sql	30 Jan 2009 02:59:51 -0000	1.2
+++ openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1.2d3-1.1.2d4.sql	1 Feb 2009 18:38:02 -0000	1.3
@@ -40,7 +40,7 @@
 	update categories 
 	set parent_id = (select t.category_id
 			from categories s, categories t
-			where s.category_id = c.parent_id
+			where s.category_id = categories.parent_id
 			and t.tree_id = p_dest_tree
 			and s.left_ind + v_new_left_ind = t.left_ind)
 	where tree_id = p_dest_tree;
Index: openacs-4/packages/categories/www/cadmin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/master.adp	9 Nov 2008 23:29:23 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/master.adp	1 Feb 2009 18:38:02 -0000	1.6
@@ -5,15 +5,7 @@
 
 <if @change_locale@ eq t and @languages@ not nil>
   <div style="float: right;">
-    <formtemplate id="locale_form">
-      @form_vars;noquote@
-      <table cellspacing="2" cellpadding="2" border="0">
-        <tr class="form-element"><td class="form-label">Language</td>
-        <td class="form-widget"><formwidget id="locale"></td></tr>
-        <tr class="form-element">
-        <td align="right" colspan="2"><formwidget id="formbutton:ok"></td></tr>
-      </table>
-    </formtemplate>
+    <formtemplate id="locale_form"></formtemplate>
   </div>
 </if>