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

Marius Cramer

2013-10-14 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816

 interface/web/sites/database_user_edit.php

@@ -147,11 +147,6 @@
         $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();
@@ -185,9 +180,6 @@
      }

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