Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/scripts/clear_jabber.php b/scripts/clear_jabber.php
index a71ccb2d67834844888ded6be7c06fc1d812a58b..c6756a5cd623865ab798e59d984c937fa76a408c 100755 (executable)
--- a/scripts/clear_jabber.php
+++ b/scripts/clear_jabber.php
@@ -34,7 +34,7 @@ Deletes a user's confirmed Jabber/XMPP address from the database.
 
 END_OF_DELETEUSER_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 if (have_option('i', 'id')) {
     $id = get_option_value('i', 'id');
@@ -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) {