Merge branch '3.6-rc'

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

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index d22ec3aaf1dbfe3ab7e8e7c629e3d4303d996fb9..b8a170a1b4678cc5f1fa18ba7daeb8bb015f42af 100644 (file)
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -7,24 +7,24 @@
  *    - who takes no responsibility for any additional content which may appear herein
  *
  */
-
+use Friendica\Core\Addon;
 
 function morechoice_install() {
 
-       register_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-       register_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-       register_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+       Addon::registerHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+       Addon::registerHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+       Addon::registerHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
 }
 
 
 function morechoice_uninstall() {
 
-       unregister_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-       unregister_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-       unregister_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+       Addon::unregisterHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+       Addon::unregisterHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+       Addon::unregisterHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
 
 // We need to leave this here for a while, because we now have a situation where people can end up with an orphaned hook.
-       unregister_hook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
+       Addon::unregisterHook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
 
 }