# HG changeset patch
# User Dan
# Date 1226258561 18000
# Node ID f191cb6bd0ca909012f1256f93fbd1eade2b7534
# Parent  904fbf10f11299777753586853fdd3f6c56a2dd5# Parent  c3752aa881c2d7c186d82668a4c046d5920a872c
Merging with upstream

diff -r c3752aa881c2 -r f191cb6bd0ca includes/clientside/static/crypto.js
--- a/includes/clientside/static/crypto.js	Sun Nov 09 14:10:24 2008 -0500
+++ b/includes/clientside/static/crypto.js	Sun Nov 09 14:22:41 2008 -0500
@@ -2042,7 +2042,7 @@
  */
 
 // Our prime number as a base for operations.
-var dh_prime = '82818079787776757473727170696867666564636261605958575655545352515049484746454443424140393837363534333231302928272625242322212019181716151413121110987654321';
+var dh_prime = '7916586051748534588306961133067968196965257961415756656521818848750723547477673457670019632882524164647651492025728980571833579341743988603191694784406703';
 
 // g, a primitive root used as an exponent
 // (2 and 5 are acceptable, but BigInt is faster with odd numbers)
diff -r c3752aa881c2 -r f191cb6bd0ca includes/diffiehellman.php
--- a/includes/diffiehellman.php	Sun Nov 09 14:10:24 2008 -0500
+++ b/includes/diffiehellman.php	Sun Nov 09 14:22:41 2008 -0500
@@ -28,7 +28,7 @@
   $dh_supported = false;
 }
 // Our prime number as a base for operations.
-$GLOBALS['dh_prime'] = '82818079787776757473727170696867666564636261605958575655545352515049484746454443424140393837363534333231302928272625242322212019181716151413121110987654321';
+$GLOBALS['dh_prime'] = '7916586051748534588306961133067968196965257961415756656521818848750723547477673457670019632882524164647651492025728980571833579341743988603191694784406703';
 
 // g, a primitive root used as an exponent
 // (2 and 5 are acceptable, but BigInt is faster with odd numbers)
diff -r c3752aa881c2 -r f191cb6bd0ca includes/sessions.php
diff -r c3752aa881c2 -r f191cb6bd0ca includes/sql_parse.php
--- a/includes/sql_parse.php	Sun Nov 09 14:10:24 2008 -0500
+++ b/includes/sql_parse.php	Sun Nov 09 14:22:41 2008 -0500
@@ -73,9 +73,14 @@
       {
         throw new Exception('SQL file doesn\'t exist');
       }
+      
     }
     $this->sql_array = false;
     $this->tpl_strings = array();
+    
+    // convert \r\n in the schema to \n, in case some FTP client or zip utility ran unix2dos for us
+    // thanks to InvisGhost for reporting this error
+    $this->sql_string = str_replace("\r\n", "\n", $this->sql_string);
   }
   
   /**