diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-01-15 08:56:15 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-01-15 08:56:15 +0100 |
commit | b49e09939a5b4222f3edf2b39430c13a4d14baeb (patch) | |
tree | d2f883403453671679ae05f779178f46eae51b0d /include/features.php | |
parent | 8970d30c936ac4ae600a6fd18c95b2cdffd1e20d (diff) | |
parent | 91db66b32d2c469a6d0292712666614b48b4c62e (diff) | |
download | volse-hubzilla-b49e09939a5b4222f3edf2b39430c13a4d14baeb.tar.gz volse-hubzilla-b49e09939a5b4222f3edf2b39430c13a4d14baeb.tar.bz2 volse-hubzilla-b49e09939a5b4222f3edf2b39430c13a4d14baeb.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 15 |
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']; } |