X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=morechoice%2Fmorechoice.php;h=d22ec3aaf1dbfe3ab7e8e7c629e3d4303d996fb9;hb=0889688e712b0a1bfe81e723972f613ad173fae3;hp=bf97b76bc834a64b99ee83170a4f18a9b6c3afc2;hpb=bbf6f71d0364b17a2c438e624e8f022646ccd2af;p=friendica-addons.git

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index bf97b76b..d22ec3aa 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -14,8 +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');
-	register_hook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
-
 }
 
 
@@ -24,6 +22,8 @@ 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');
+
+// 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');
 
 }
@@ -123,11 +123,4 @@ function morechoice_marital_selector($a,&$b) {
 		$b[] = 'Hurt in the past';
 		$b[] = 'Wallowing in self-pity';
 	}
-}
-
-function morechoice_poke_verbs($a,&$b) {
-	$b['bitchslap'] = array('bitchslapped', t('bitchslap'), t('bitchslapped'));
-	$b['shag'] = array('shag', t('shag'), t('shagged'));
-
-
 }
\ No newline at end of file