Clean up the code

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

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index da5f386d7ac55a8b1e5909f9387d10b0b223b795..d22ec3aaf1dbfe3ab7e8e7c629e3d4303d996fb9 100644 (file)
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -14,7 +14,6 @@ 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');
-
 }
 
 
@@ -24,6 +23,9 @@ function morechoice_uninstall() {
        unregister_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
        unregister_hook('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');
+
 }
 
 // We aren't going to bother translating these to other languages. 
@@ -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