aboutsummaryrefslogtreecommitdiffstats
path: root/include/features.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-15 21:49:28 -0800
committerzotlabs <mike@macgirvin.com>2018-01-15 21:49:28 -0800
commit05f9f0a393d7e414481f3e33e651d33f341e59b0 (patch)
tree093113813f751891d6f1686e9351727b449c102b /include/features.php
parent76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f (diff)
parent746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (diff)
downloadvolse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.tar.gz
volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.tar.bz2
volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/features.php')
-rw-r--r--include/features.php15
1 files changed, 4 insertions, 11 deletions
diff --git a/include/features.php b/include/features.php
index 8601ff79e..69eeed3e8 100644
--- a/include/features.php
+++ b/include/features.php
@@ -374,15 +374,6 @@ function get_features($filtered = true) {
t('Post/Comment Tools'),
[
- 'markdown',
- t('Markdown'),
- t('Use markdown for editing posts'),
- false,
- get_config('feature_lock','markdown'),
- feature_level('markdown',2),
- ],
-
- [
'commtag',
t('Community Tagging'),
t('Ability to tag existing posts'),
@@ -490,6 +481,8 @@ function get_features($filtered = true) {
else {
$narr = $arr;
}
- call_hooks('get_features',$narr);
- return $narr;
+
+ $x = [ 'features' => $narr, 'filtered' => $filtered, 'techlevel' => $techlevel ];
+ call_hooks('get_features',$x);
+ return $x['features'];
}