Fix a bug in valid_name where it wasn't checking for name collisions on new users.

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index baac9315..9871ca00 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -122,7 +122,7 @@ class User_Model extends ORM implements User_Definition {
   public function valid_name(Validation $v, $field) {
     if (db::build()->from("users")
         ->where("name", "=", $this->name)
-        ->where("id", "<>", $this->id)
+        ->merge_where($this->id ? array(array("id", "<>", $this->id)) : null)
         ->count_records() == 1) {
       $v->add_error("name", "conflict");
     }