diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-05 06:28:52 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-05 06:28:52 +0100 |
| commit | 2afdba48f06bb99922c19bf964d8f601c1545166 (patch) | |
| tree | bbd1418a44cee6306a568bb64f4caa2d93eeb289 /include/text.php | |
| parent | 8f810a3dcfd60c00b14d3da811e1c0cf005e8ced (diff) | |
| parent | 425089524373137e11d3691e7efdce0fb89281c8 (diff) | |
| download | volse-hubzilla-2afdba48f06bb99922c19bf964d8f601c1545166.tar.gz volse-hubzilla-2afdba48f06bb99922c19bf964d8f601c1545166.tar.bz2 volse-hubzilla-2afdba48f06bb99922c19bf964d8f601c1545166.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/include/text.php b/include/text.php index 0b5ad9c72..f6fa1c304 100644 --- a/include/text.php +++ b/include/text.php @@ -968,16 +968,24 @@ function get_poke_verbs() { // index is present tense verb // value is array containing past tense verb, translation of present, translation of past - $arr = array( - 'poke' => array( 'poked', t('poke'), t('poked')), - 'ping' => array( 'pinged', t('ping'), t('pinged')), - 'prod' => array( 'prodded', t('prod'), t('prodded')), - 'slap' => array( 'slapped', t('slap'), t('slapped')), - 'finger' => array( 'fingered', t('finger'), t('fingered')), - 'rebuff' => array( 'rebuffed', t('rebuff'), t('rebuffed')), - ); + if(get_config('system','poke_basic')) { + $arr = array( + 'poke' => array( 'poked', t('poke'), t('poked')), + ); + } + else { + $arr = array( + 'poke' => array( 'poked', t('poke'), t('poked')), + 'ping' => array( 'pinged', t('ping'), t('pinged')), + 'prod' => array( 'prodded', t('prod'), t('prodded')), + 'slap' => array( 'slapped', t('slap'), t('slapped')), + 'finger' => array( 'fingered', t('finger'), t('fingered')), + 'rebuff' => array( 'rebuffed', t('rebuff'), t('rebuffed')), + ); + + call_hooks('poke_verbs', $arr); + } - call_hooks('poke_verbs', $arr); return $arr; } |