[openstreetmap] Ensure location key is available in hook data

[friendica-addons.git] / blockem / blockem.php

diff --git a/blockem/blockem.php b/blockem/blockem.php
index 8fb2875a125b037dd5c2b4f4d2ffcbe8050f054d..1880b9be44e5029bcc36a7da1e20c78746177bc8 100644 (file)
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -23,18 +23,6 @@ function blockem_install()
        Hook::register('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
 }
 
-function blockem_uninstall()
-{
-       Hook::unregister('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
-       Hook::unregister('prepare_body'               , 'addon/blockem/blockem.php', 'blockem_prepare_body');
-       Hook::unregister('display_item'               , 'addon/blockem/blockem.php', 'blockem_display_item');
-       Hook::unregister('addon_settings'             , 'addon/blockem/blockem.php', 'blockem_addon_settings');
-       Hook::unregister('addon_settings_post'        , 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
-       Hook::unregister('conversation_start'         , 'addon/blockem/blockem.php', 'blockem_conversation_start');
-       Hook::unregister('item_photo_menu'            , 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
-       Hook::unregister('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
-}
-
 function blockem_addon_settings (App $a, &$s)
 {
        if (!local_user()) {
@@ -78,7 +66,6 @@ function blockem_addon_settings_post(App $a, array &$b)
 
        if (!empty($_POST['blockem-submit'])) {
                DI::pConfig()->set(local_user(), 'blockem', 'words', trim($_POST['blockem-words']));
-               info(DI::l10n()->t('BLOCKEM Settings saved.') . EOL);
        }
 }
 
@@ -108,7 +95,8 @@ function blockem_enotify_store(App $a, array &$b)
        }
 
        if ($found) {
-               $b['abort'] = true;
+               // empty out the fields
+               $b = [];
        }
 }
 
@@ -241,6 +229,5 @@ function blockem_init(App $a)
        }
 
        DI::pConfig()->set(local_user(), 'blockem', 'words', $words);
-       info(DI::l10n()->t('blockem settings updated') . EOL);
        exit();
 }