diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-18 09:22:08 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-18 09:22:08 -0700 |
| commit | 85b93310ddb4cd82ebe1fcefea1ff81ae5746fd0 (patch) | |
| tree | c1a64438adfecd83702be7f03c2e1feecf0312a6 | |
| parent | d11593246648d3fbad30b4405d5dbbf73063769a (diff) | |
Ensure that DB connection is active at start of User::updateKeys() and Foreign_user::updateKeys(); calls to $this->_quote() require a live connection object and don't lazy-initialize themselves.
May fix WSOD when changing incoming email address.
| -rw-r--r-- | classes/Foreign_user.php | 1 | ||||
| -rw-r--r-- | classes/User.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php index 8b3e03dfb..0dd94ffb9 100644 --- a/classes/Foreign_user.php +++ b/classes/Foreign_user.php @@ -41,6 +41,7 @@ class Foreign_user extends Memcached_DataObject function updateKeys(&$orig) { + $this->_connect(); $parts = array(); foreach (array('id', 'service', 'uri', 'nickname') as $k) { if (strcmp($this->$k, $orig->$k) != 0) { diff --git a/classes/User.php b/classes/User.php index 77091fad5..ee1006ee1 100644 --- a/classes/User.php +++ b/classes/User.php @@ -87,6 +87,7 @@ class User extends Memcached_DataObject function updateKeys(&$orig) { + $this->_connect(); $parts = array(); foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) { if (strcmp($this->$k, $orig->$k) != 0) { |