Merge pull request 'CLD: New plugin for language detection via CLD2' (#1425) from...

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

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index e1976c5de8a3c6b23172e7551df24e35c8f51e58..fe726d279936849cdbc5d690c5ed0611d7cecd64 100644 (file)
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -5,9 +5,10 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *    - who takes no responsibility for any additional content which may appear herein
- *
+ * Status: Deprecated
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -18,19 +19,7 @@ function morechoice_install() {
        Hook::register('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
 }
 
-
-function morechoice_uninstall() {
-
-       Hook::unregister('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-       Hook::unregister('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-       Hook::unregister('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.
-       Hook::unregister('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
-
-}
-
-function morechoice_gender_selector($a,&$b) {
+function morechoice_gender_selector(array &$b) {
        $b['Androgyne'] = DI::l10n()->t('Androgyne');
        $b['Bear'] = DI::l10n()->t('Bear');
        $b['Bigender'] = DI::l10n()->t('Bigender');
@@ -56,7 +45,7 @@ function morechoice_gender_selector($a,&$b) {
        $b['Hard to tell these days'] = DI::l10n()->t('Hard to tell these days');
 }
 
-function morechoice_sexpref_selector($a,&$b) {
+function morechoice_sexpref_selector(array &$b) {
        $b['Girls with big tits'] = DI::l10n()->t('Girls with big tits');
        $b['Millionaires'] = DI::l10n()->t('Millionaires');
        $b['Guys with big schlongs'] = DI::l10n()->t('Guys with big schlongs');
@@ -109,7 +98,7 @@ function morechoice_sexpref_selector($a,&$b) {
        $b['I\'d rather just have some chocolate'] = DI::l10n()->t('I\'d rather just have some chocolate');
 }
 
-function morechoice_marital_selector($a,&$b) {
+function morechoice_marital_selector(array &$b) {
        $b['Married to my job'] = DI::l10n()->t('Married to my job');
        $b['Polygamist'] = DI::l10n()->t('Polygamist');
        $b['Half married'] = DI::l10n()->t('Half married');