Make sure the admin password is hashed when inserting the admin user …

…on an already installed Vanilla.
vanilla · Mar 2, 2013 · c7748bf · c7748bf
1 parent 32aeeb5
commit c7748bf
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/applications/dashboard/models/class.usermodel.php b/applications/dashboard/models/class.usermodel.php
@@ -152,7 +152,7 @@ protected function _Insert($Fields, $Options = array()) {
       }
 
       // Make sure to encrypt the password for saving...
-      if (array_key_exists('Password', $Fields)) {
+      if (array_key_exists('Password', $Fields) && !array_key_exists('HashMethod', $Fields)) {
          $PasswordHash = new Gdn_PasswordHash();
          $Fields['Password'] = $PasswordHash->HashPassword($Fields['Password']);
          $Fields['HashMethod'] = 'Vanilla';
@@ -985,7 +985,12 @@ public function SaveAdminUser($FormPostValues) {
          $Fields['UserID'] = 1;
 
          if ($this->GetID($UserID) !== FALSE) {
-            $this->SQL->Put($this->Name, $Fields);
+            // Re-hash the password here.
+            $PasswordHash = new Gdn_PasswordHash();
+            $Fields['Password'] = $PasswordHash->HashPassword($Fields['Password']);
+            $Fields['HashMethod'] = 'Vanilla';
+
+            $this->SQL->Put($this->Name, $Fields, array('UserID' => 1));
          } else {
             // Insert the new user
             $UserID = $this->_Insert($Fields, array('NoConfirmEmail' => TRUE));