Ensure that DB connection is active at start of User::updateKeys() and Foreign_user...

May fix WSOD when changing incoming email address.

diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index 8b3e03dfb33f3d7f5c1e39cdf2d04160c72d07de..0dd94ffb99789a38a344fc1f5936bd25a064f683 100644 (file)
--- 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 13f63010f74a624fe69e3ddd604f7adc5b9316a0..0b25b71a032a0476516089990467cc5edde97eb9 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -91,6 +91,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) {