Update deprecated calls in Model\user and mod/removeme

diff --git a/mod/removeme.php b/mod/removeme.php
index 49b8f6d5345d4478ecb83582c02f3b989ea9cec2..2f0eb2d37e7f5797585a93379fe159913bd637cb 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -57,7 +57,7 @@ function removeme_post(App $a)
                ]);
        }
 
-       if (User::authenticate($a->user, trim($_POST['qxz_password']))) {
+       if (User::getIdFromPasswordAuthentication($a->user, trim($_POST['qxz_password']))) {
                User::remove($a->user['uid']);
                // NOTREACHED
        }

diff --git a/src/Model/User.php b/src/Model/User.php
index 65c7d8c9738747167ee66270fbd2e650aa50abee..aa05b492b00d3afbfdb01250770f7cb9eb01e00a 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -9,6 +9,7 @@ use DivineOmega\PasswordExposed;
 use Exception;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
@@ -791,7 +792,7 @@ class User
 
                $user = DBA::selectFirst('user', [], ['uid' => $uid]);
 
-               Addon::callHooks('remove_user', $user);
+               Hook::callAll('remove_user', $user);
 
                // save username (actually the nickname as it is guaranteed
                // unique), so it cannot be re-registered in the future.