updateKeys -> updateWithKeys (w/ functionality)

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 05ddce75a92e0d7f45663c487aba377970e0fb2c..1e2d3a92d6d3104a8bc6650d9fe45e9726308c6e 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -108,7 +108,7 @@ class ConfirmaddressAction extends Action
                 $cur->smsemail = $carrier->toEmailAddress($cur->sms);
             }
 
-            $result = $cur->updateKeys($orig_user);
+            $result = $cur->updateWithKeys($orig_user);
 
             if (!$result) {
                 common_log_db_error($cur, 'UPDATE', __FILE__);

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index fea649d6def474d7512e131245fd9d0f39957a94..483131c779f9d415f55311b8d0723ccfbfab2f82 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -484,7 +484,7 @@ class EmailsettingsAction extends SettingsAction
 
         $user->email = null;
 
-        $result = $user->updateKeys($original);
+        $result = $user->updateWithKeys($original);
 
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
@@ -517,7 +517,7 @@ class EmailsettingsAction extends SettingsAction
         $user->incomingemail = null;
         $user->emailpost = 0;
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing incoming e-mail address.
             $this->serverError(_('Could not update user record.'));
@@ -541,7 +541,7 @@ class EmailsettingsAction extends SettingsAction
         $user->incomingemail = mail_new_incoming_address();
         $user->emailpost = 1;
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error adding incoming e-mail address.
             $this->serverError(_('Could not update user record.'));

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 2bdb6774eadb2f18908e1e14309e31e44f422943..46df772b73214047dcd05351e5cda52ef216e6ae 100644 (file)
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -105,7 +105,7 @@ class RecoverpasswordAction extends Action
         if (!$user->email) {
             $orig = clone($user);
             $user->email = $email;
-            $result = $user->updateKeys($orig);
+            $result = $user->updateWithKeys($orig);
             if (!$result) {
                 common_log_db_error($user, 'UPDATE', __FILE__);
                 // TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.

diff --git a/actions/smssettings.php b/actions/smssettings.php
index d8e219db413c4c8dcbc60d01c44b68d84a83657b..ec2fcfd89e94cd6694eb88280f45121c6659f934 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -444,7 +444,7 @@ class SmssettingsAction extends SettingsAction
         $user->carrier  = null;
         $user->smsemail = null;
 
-        $result = $user->updateKeys($original);
+        $result = $user->updateWithKeys($original);
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered SMS phone number.
@@ -556,7 +556,7 @@ class SmssettingsAction extends SettingsAction
 
         $user->incomingemail = null;
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error displayed when the user could not be updated in SMS settings.
             $this->serverError(_('Could not update user record.'));
@@ -581,7 +581,7 @@ class SmssettingsAction extends SettingsAction
 
         $user->incomingemail = mail_new_incoming_address();
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error displayed when the user could not be updated in SMS settings.
             $this->serverError(_('Could not update user record.'));

diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index d20d3cc27ea2dc65f17036ec0aee4820ce72cd63..8428d11dcbf8578f90500f92917fcd053d441157 100644 (file)
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -322,13 +322,16 @@ abstract class Managed_DataObject extends Memcached_DataObject
     }
 
     // 'update' won't write key columns, so we have to do it ourselves.
-    public function updateKeys(&$orig)
+    // This also automatically calls "update" _before_ it sets the keys.
+    public function updateWithKeys(&$orig)
     {
         if (!$orig instanceof $this) {
             throw new ServerException('Tried updating a DataObject with a different class than itself.');
         }
 
-        $this->_connect();
+        // Update non-keys first, if necessary.
+        $this->update($orig);
+
         $parts = array();
         foreach ($this->keys() as $k) {
             if (strcmp($this->$k, $orig->$k) != 0) {

diff --git a/classes/Profile.php b/classes/Profile.php
index 8352861fe63089cb187f92d1cbf3bf67b1baeaee..ea99244e3189db8a06cd3c0ae0f45db6a1e4c70c 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -838,7 +838,7 @@ class Profile extends Managed_DataObject
                 common_debug("Updating User ({$this->id}) nickname from {$dataObject->nickname} to {$this->nickname}");
                 $origuser = clone($local);
                 $local->nickname = $this->nickname;
-                $result = $local->updateKeys($origuser);
+                $result = $local->updateWithKeys($origuser);
                 if ($result === false) {
                     common_log_db_error($local, 'UPDATE', __FILE__);
                     // TRANS: Server error thrown when user profile settings could not be updated.

diff --git a/plugins/RequireValidatedEmail/actions/confirmfirstemail.php b/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
index 0019d1c6be90303aa020187b1c5741043b31a2b9..465814342d1bd44eca0e2acebc3089ab6a6c6086 100644 (file)
--- a/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
+++ b/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
@@ -150,7 +150,7 @@ class ConfirmfirstemailAction extends Action
 
         $this->user->email = $this->confirm->address;
 
-        $this->user->updateKeys($orig);
+        $this->user->updateWithKeys($orig);
 
         $this->user->emailChanged();
 

diff --git a/scripts/clear_jabber.php b/scripts/clear_jabber.php
index a71ccb2d67834844888ded6be7c06fc1d812a58b..4a7de8a3d91fb3d29c5cc27d593f3fa0d0f3685c 100755 (executable)
--- a/scripts/clear_jabber.php
+++ b/scripts/clear_jabber.php
@@ -75,7 +75,7 @@ function clear_jabber($id)
         } else {
             $original = clone($user);
             $user->jabber = null;
-            $result = $user->updateKeys($original);
+            $result = $user->updateWithKeys($original);
         }
         echo "\n";
     } else if (!$user) {

diff --git a/scripts/registeruser.php b/scripts/registeruser.php
index d2a47b6be9737b27f3cc30603aefd496cdbb9344..cc0bd5598de088e7d72808470e7734c93cdff914 100644 (file)
--- a/scripts/registeruser.php
+++ b/scripts/registeruser.php
@@ -69,7 +69,7 @@ try {
 
         $user->email = $email;
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             print "Failed!\n";
             throw new Exception("Can't update email address.");
         }