Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

LimeSurvey · Jul 20, 2012 · a28788a · a28788a
2 parents c27f1ce + 9384ec7
commit a28788a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/admin/statistics.php b/admin/statistics.php
@@ -282,7 +282,7 @@
 foreach ($survlangs as $survlang)
 {
     $language_options .= "\t<option value=\"{$survlang}\"";
-    if ($_SESSION['adminlang'] == $survlang)
+    if ($statlang == $survlang)
     {
         $language_options .= "selected=\"selected\" " ;
     }

diff --git a/common_functions.php b/common_functions.php
@@ -4803,7 +4803,7 @@ function createPassword()
 
     for ($i=0; $i<$password_length; $i++)
     {
-        $passwd .= $pwchars[floor(rand(0,strlen($pwchars)-1))];
+        $passwd .= $pwchars[(int)floor(rand(0,strlen($pwchars)-1))];
     }
     return $passwd;
 }