Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-01-07 ddb461f596d9f013afe4f215fabc0eabc62b1fb0

 interface/web/sites/database_user_edit.php

@@ -147,6 +147,11 @@
         $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
      }

      /* prepare password for MongoDB */
      // TODO: this still doens't work as when only the username changes we have no database_password.
      // taking the one from oldData doesn't work as it's encrypted...shit!
      $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];

      $this->dataRecord['server_id'] = 0; // we need this on all servers

      parent::onBeforeUpdate();
@@ -181,6 +186,9 @@

      $this->dataRecord['server_id'] = 0; // we need this on all servers

      /* prepare password for MongoDB */
      $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];

      parent::onBeforeInsert();
   }