# HG changeset patch
# User Dan
# Date 1245111030 14400
# Node ID 722f4beeceb615fb5aab2ad3922bcbbcf73ae526
# Parent  5a282dbf8fad7c47b1a8369eeb82d82f88e76f06# Parent  06debbf8dd759a48a0cd795e78d15ba124f3ed4a
Merging branches. Revision 2^10! :D

diff -r 5a282dbf8fad -r 722f4beeceb6 install/includes/stages/confirm.php
--- a/install/includes/stages/confirm.php	Mon Jun 15 20:09:58 2009 -0400
+++ b/install/includes/stages/confirm.php	Mon Jun 15 20:10:30 2009 -0400
@@ -35,7 +35,7 @@
               echo '</div>';
             }
             ?>
-            <form action="install.php?stage=install" method="post" name="install_login" onsubmit="return ( verify() && submit_encrypt() );"><?php
+            <form action="install.php?stage=install" method="post" name="install_login"><?php
   foreach ( $_POST as $key => &$value )
   {
     if ( !preg_match('/^[a-z0-9_]+$/', $key) )
diff -r 5a282dbf8fad -r 722f4beeceb6 install/includes/stages/database_mysql.php
--- a/install/includes/stages/database_mysql.php	Mon Jun 15 20:09:58 2009 -0400
+++ b/install/includes/stages/database_mysql.php	Mon Jun 15 20:10:30 2009 -0400
@@ -330,7 +330,7 @@
         db_root_pass: frm.db_root_pass.value
       }));
     
-    ajaxPost(scriptPath + '/install/install.php?stage=database', connection_info + '&driver=mysql&ajax_test=on&language=' + enano_lang_code[ENANO_LANG_ID], function()
+    ajaxPost(scriptPath + '/install/install.php?stage=database', connection_info + '&driver=mysql&ajax_test=on&language=' + enano_lang_code[ENANO_LANG_ID], function(ajax)
       {
         if ( ajax.readyState == 4 && ajax.status == 200 )
         {
diff -r 5a282dbf8fad -r 722f4beeceb6 install/includes/stages/database_postgresql.php
--- a/install/includes/stages/database_postgresql.php	Mon Jun 15 20:09:58 2009 -0400
+++ b/install/includes/stages/database_postgresql.php	Mon Jun 15 20:10:30 2009 -0400
@@ -268,7 +268,7 @@
         db_root_pass: frm.db_root_pass.value
       }));
     
-    ajaxPost(scriptPath + '/install/install.php?stage=database', connection_info + '&driver=postgresql&ajax_test=on&language=' + enano_lang_code[ENANO_LANG_ID], function()
+    ajaxPost(scriptPath + '/install/install.php?stage=database', connection_info + '&driver=postgresql&ajax_test=on&language=' + enano_lang_code[ENANO_LANG_ID], function(ajax)
       {
         if ( ajax.readyState == 4 && ajax.status == 200 )
         {