diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-07-21 04:56:41 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-07-21 04:56:41 -0400 |
| commit | 98af7402c7d4b6fba268dcba7fd26fa285c413c6 (patch) | |
| tree | a71e5c6bbf7acea7e8f5fc1c18fe1b10a484328e | |
| parent | d515fae0a87abfb08f9522c2d7938f3d51363556 (diff) | |
update keys for incomingemail
darcs-hash:20080721085641-84dde-9b29902977f78714188ba5fe8c37b4d603c3c63b.gz
| -rw-r--r-- | actions/emailsettings.php | 6 | ||||
| -rw-r--r-- | classes/User.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php index cbc4f644f..2173645f7 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -269,8 +269,8 @@ class EmailsettingsAction extends SettingsAction { $orig = clone($user); $user->incomingemail = NULL; - - if (!$user->update($orig)) { + + if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); $this->server_error(_("Couldn't update user record.")); } @@ -284,7 +284,7 @@ class EmailsettingsAction extends SettingsAction { $orig = clone($user); $user->incomingemail = mail_new_incoming_address(); - if (!$user->update($orig)) { + if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); $this->server_error(_("Couldn't update user record.")); } diff --git a/classes/User.php b/classes/User.php index 6f4bf1ab2..e4928eb34 100644 --- a/classes/User.php +++ b/classes/User.php @@ -79,7 +79,7 @@ class User extends DB_DataObject function updateKeys(&$orig) { $parts = array(); - foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier', 'smsemail') as $k) { + foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail') as $k) { if (strcmp($this->$k, $orig->$k) != 0) { $parts[] = $k . ' = ' . $this->_quote($this->$k); } |