Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 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();
   }