Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / scripts / clear_jabber.php

diff --git a/scripts/clear_jabber.php b/scripts/clear_jabber.php
index 50edebd78ddc86352f4461bd217feb8c8ee964ff..c6756a5cd623865ab798e59d984c937fa76a408c 100755 (executable)
--- a/scripts/clear_jabber.php
+++ b/scripts/clear_jabber.php
@@ -75,7 +75,11 @@ function clear_jabber($id)
         } else {
             $original = clone($user);
             $user->jabber = null;
-            $result = $user->updateKeys($original);
+            try {
+                $user->updateWithKeys($original);
+            } catch (Exception $e) {
+                echo "WARNING: user update failed (setting jabber to null): ".$e->getMessage()."\n";
+            }
         }
         echo "\n";
     } else if (!$user) {