summaryrefslogtreecommitdiff
path: root/modules/user/models/user.php
diff options
context:
space:
mode:
authorChad Parry <github@chad.parry.org>2011-04-24 08:28:39 -0600
committerChad Parry <github@chad.parry.org>2011-04-24 08:28:39 -0600
commit26585fed03236f0f70a75959e1d3002025f4e15e (patch)
tree33a89567f40dbbdb8affcbe76baa27b242bc6d75 /modules/user/models/user.php
parent809567f12850f59bdeb47a2963f6968b99b5a201 (diff)
parentc8f90e861b866d0caa86343a6c7213e923023d39 (diff)
Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto
Diffstat (limited to 'modules/user/models/user.php')
-rw-r--r--modules/user/models/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 145738ca..a8a3a0e7 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -147,7 +147,7 @@ class User_Model_Core extends ORM implements User_Definition {
}
if (!$this->loaded() || isset($this->password_length)) {
- $minimum_length = module::get_var("user", "mininum_password_length", 5);
+ $minimum_length = module::get_var("user", "minimum_password_length", 5);
if ($this->password_length < $minimum_length) {
$v->add_error("password", "min_length");
}