From 345dbb35217c36b258520dbf815133613c339a72 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 8 Feb 2021 22:46:01 +0300 Subject: rewrite some more hooks --- classes/pref/feeds.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'classes/pref') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 058acec34..5dc0e75e5 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1586,12 +1586,9 @@ class Pref_Feeds extends Handler_Protected { } static function remove_feed($id, $owner_uid) { - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) { - if (! $p->hook_unsubscribe_feed($id, $owner_uid)) { - user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING); - return; - } - } + + if (PluginHost::getInstance()->run_hooks_until(PluginHost::HOOK_UNSUBSCRIBE_FEED, true, $id, $owner_uid)) + return; $pdo = Db::pdo(); -- cgit v1.2.3-54-g00ecf