From: Evan Prodromou Date: Mon, 21 Jul 2008 08:56:41 +0000 (-0400) Subject: update keys for incomingemail X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=98af7402c7d4b6fba268dcba7fd26fa285c413c6;p=quix0rs-gnu-social.git update keys for incomingemail darcs-hash:20080721085641-84dde-9b29902977f78714188ba5fe8c37b4d603c3c63b.gz --- diff --git a/actions/emailsettings.php b/actions/emailsettings.php index cbc4f644f3..2173645f75 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 6f4bf1ab2f..e4928eb34a 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); }