Index: openacs-4/packages/acs-admin/www/users/merge-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	24 May 2005 02:54:59 -0000	1.1.2.1
+++ openacs-4/packages/acs-admin/www/users/merge-confirm.tcl	8 Jun 2005 11:48:22 -0000	1.1.2.2
@@ -22,9 +22,9 @@
 
 
 if { [string equal $merge_action "0"] } {
-    set temp_id $from_user_id
+    set tempid $from_user_id
     set from_user_id $to_user_id
-    set to_user_id $temp_id
+    set to_user_id $tempid
 }
 
 
Index: openacs-4/packages/acs-admin/www/users/merge-final.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-admin/www/users/merge-final.adp	24 May 2005 02:54:59 -0000	1.1.2.1
+++ openacs-4/packages/acs-admin/www/users/merge-final.adp	8 Jun 2005 11:48:22 -0000	1.1.2.2
@@ -4,10 +4,9 @@
     
     <h2>Merging ...</h2>
 
-    <p/>
-      
-      @temp;noquote@
-
+    <if @merge_p@ ne 0>
       <p/>
-	@msg@
-      
+        @results;noquote@
+      <p/>
+        @msg@
+    </if>  
Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	8 Jun 2005 11:11:49 -0000	1.1.2.2
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	8 Jun 2005 11:48:22 -0000	1.1.2.3
@@ -34,9 +34,9 @@
 } else {
     set final_results [callback MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id]
 
-    set temp "<ul>"
+    set results "<ul>"
     foreach res $final_results {
-	append temp "<li>$res</li>"
+	append results "<li>$res</li>"
     }
 
     set impl_id [auth::authority::get_element -authority_id $to_authority_id -element "auth_impl_id"]
@@ -50,10 +50,10 @@
 
 
     foreach item $user_res {
-	append temp "<li>$item</li>"
+	append results "<li>$item</li>"
     }
 
-    append temp "</ul>"
+    append results "</ul>"
 
     set msg "Merge is done"
     ns_log Notice $msg