aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-01 19:01:02 -0700
committerredmatrix <mike@macgirvin.com>2016-09-01 19:01:02 -0700
commitaf87038150dc9405e62c9eab0b0aacd4f13232d3 (patch)
tree184e0ac0530c1898cf7ecb3dc39d148d60b3b74e /Zotlabs/Module
parent720f1d71233ab9f6be3ea4ae4b09d823fdca7367 (diff)
downloadvolse-hubzilla-af87038150dc9405e62c9eab0b0aacd4f13232d3.tar.gz
volse-hubzilla-af87038150dc9405e62c9eab0b0aacd4f13232d3.tar.bz2
volse-hubzilla-af87038150dc9405e62c9eab0b0aacd4f13232d3.zip
separate the 'expert' feature into 'advanced_theming' and 'advanced_dirsearch'. Hide both features unless techlevel > 3.
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Directory.php2
-rw-r--r--Zotlabs/Module/Settings.php4
2 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 84d40a166..691e48520 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -84,7 +84,7 @@ class Directory extends \Zotlabs\Web\Controller {
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
- if(strpos($search,'=') && local_channel() && get_pconfig(local_channel(),'feature','expert'))
+ if(strpos($search,'=') && local_channel() && feature_enabled(local_channel(),'feature','advanced_dirsearch'))
$advanced = $search;
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index cf6f96e87..7612b4892 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -1071,7 +1071,7 @@ class Settings extends \Zotlabs\Web\Controller {
'$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no),
'$layout_editor' => t('System Page Layout Editor - (advanced)'),
'$theme_config' => $theme_config,
- '$expert' => feature_enabled(local_channel(),'expert'),
+ '$expert' => feature_enabled(local_channel(),'advanced_theming'),
'$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_channel(),'system','channel_list_mode'), t('(comments displayed separately)'), $yes_no),
'$network_list_mode' => array('network_list_mode', t('Use blog/list mode on grid page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no),
'$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')),
@@ -1337,8 +1337,6 @@ class Settings extends \Zotlabs\Web\Controller {
'$h_advn' => t('Advanced Account/Page Type Settings'),
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,
- '$expert' => feature_enabled(local_channel(),'expert'),
- '$hint' => t('Please enable expert mode (in <a href="settings/features">Settings > Additional features</a>) to adjust!'),
'$lbl_misc' => t('Miscellaneous Settings'),
'$photo_path' => array('photo_path', t('Default photo upload folder'), get_pconfig(local_channel(),'system','photo_path'), t('%Y - current year, %m - current month')),
'$attach_path' => array('attach_path', t('Default file upload folder'), get_pconfig(local_channel(),'system','attach_path'), t('%Y - current year, %m - current month')),