aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-02-04 11:58:56 -0800
committerredmatrix <git@macgirvin.com>2016-02-04 11:58:56 -0800
commit18208fab8462ebeffe047110d696c6d6cbf13a05 (patch)
tree62800d6940f2a274bf889756ec3e02bd7d30b1ee
parentc598bbb8a94e2acd30f9f1a121dfcc2bffe6ee3d (diff)
downloadvolse-hubzilla-18208fab8462ebeffe047110d696c6d6cbf13a05.tar.gz
volse-hubzilla-18208fab8462ebeffe047110d696c6d6cbf13a05.tar.bz2
volse-hubzilla-18208fab8462ebeffe047110d696c6d6cbf13a05.zip
poke basic config setting
-rw-r--r--include/text.php26
-rw-r--r--version.inc2
2 files changed, 18 insertions, 10 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;
}
diff --git a/version.inc b/version.inc
index acec8d8d9..17c7ed1be 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-03.1298H
+2016-02-04.1299H