diff options
| author | Simon | 2011-03-11 00:48:32 +0100 |
|---|---|---|
| committer | Simon | 2011-03-11 00:48:32 +0100 |
| commit | 87239f3f5905fb5ca937faec449256a7801a1440 (patch) | |
| tree | c76e923b6aec6fa0a4674fc4b287538d0b386ea9 /application/models/Person.php | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-87239f3f5905fb5ca937faec449256a7801a1440.tar.gz pbs2-87239f3f5905fb5ca937faec449256a7801a1440.tar.xz pbs2-87239f3f5905fb5ca937faec449256a7801a1440.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/models/Person.php')
| -rw-r--r-- | application/models/Person.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/application/models/Person.php b/application/models/Person.php index b4545e9..aea348d 100644 --- a/application/models/Person.php +++ b/application/models/Person.php @@ -45,6 +45,8 @@ class Application_Model_Person public function setOptions(array $options) { $methods = get_class_methods($this); + $options['passwordSalt'] = $options['password_salt']; + unset($options['password_salt']); foreach ($options as $key => $value) { $method = 'set' . ucfirst($key); if (in_array($method, $methods)) { |