Index: openacs-4/packages/layout-manager/tcl/element-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-manager/tcl/element-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/layout-manager/tcl/element-procs.xql	30 Aug 2008 00:34:10 -0000	1.2
+++ openacs-4/packages/layout-manager/tcl/element-procs.xql	3 Dec 2008 09:22:00 -0000	1.3
@@ -16,35 +16,35 @@
                    :theme,
                    :state,
                    coalesce((select max(layout_elements.sort_key) + 1
-                        from layout_elements
-                        where page_id = :page_id
-                        and page_column = :page_column), 1),
+                             from layout_elements
+                             where page_id = :page_id
+                             and page_column = :page_column),
+                            1),
                    layout_includelets.required_privilege,
                    :package_id
             from layout_includelets
             where layout_includelets.name = :includelet_name
         </querytext>
     </fullquery>
 
-    <fullquery name="layout::element::copy.copy_element">
+    <fullquery name="layout::element::clone.clone_element">
         <querytext>
           insert into layout_elements
             (element_id, includelet_name, name, title, page_id, page_column, theme,
              state, sort_key, required_privilege, package_id)
-            select :new_element_id, includelet_name, name, title, :page_id, :page_column,
-                   theme, :state,
-                   coalesce((select max(layout_elements.sort_key) + 1
-                        from layout_elements
-                        where page_id = :page_id
-                        and page_column = :page_column), 1),
-                   required_privilege,
-                   package_id
-            from layout_elements
-            where element_id = :element_id
+            select :new_element_id, le.includelet_name, coalesce(:name, le.name),
+              coalesce(:title, le.title), coalesce(:page_id, le.page_id),
+              coalesce(:page_column, le.page_column), coalesce(:theme, le.theme),
+              coalesce(:state, le.state),
+              coalesce(:sort_key, sort_key),
+              coalesce(:required_privilege, required_privilege),
+              package_id
+            from layout_elements le
+            where le.element_id = :element_id
         </querytext>
     </fullquery>
 
-    <fullquery name="layout::element::copy.copy_element_parameters">
+    <fullquery name="layout::element::clone.clone_element_parameters">
         <querytext>
           insert into layout_element_parameters
             (element_id, key, value)