X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=morechoice%2Fmorechoice.php;h=b8a170a1b4678cc5f1fa18ba7daeb8bb015f42af;hp=da5f386d7ac55a8b1e5909f9387d10b0b223b795;hb=3268eecd722126c532f9cef18b8657c10046a89e;hpb=3db1bbc9302aaac6c5660e8c85ea09dc92e3483c

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index da5f386d..b8a170a1 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -7,22 +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.
+	Addon::unregisterHook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
 
 }
 
@@ -107,6 +109,7 @@ function morechoice_sexpref_selector($a,&$b) {
 		$b[] = 'Eating people';
 		$b[] = 'Being eaten';
 		$b[] = 'Animals';
+		$b[] = 'I\'d rather just have some chocolate';
 	}
 }
 
@@ -115,6 +118,9 @@ function morechoice_marital_selector($a,&$b) {
 		$b[] = 'Married to my job';
 		$b[] = 'Polygamist';
 		$b[] = 'Half married';
-
+		$b[] = 'Living in the past';
+		$b[] = 'Pretending to be over my ex';
+		$b[] = 'Hurt in the past';
+		$b[] = 'Wallowing in self-pity';
 	}
-}
+}
\ No newline at end of file