From 85b93310ddb4cd82ebe1fcefea1ff81ae5746fd0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 18 Mar 2010 09:22:08 -0700
Subject: [PATCH] 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.

---
 classes/Foreign_user.php | 1 +
 classes/User.php         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index 8b3e03dfb3..0dd94ffb99 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 77091fad5d..ee1006ee18 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) {