diff options
| author | friendica <info@friendica.com> | 2014-09-12 14:24:45 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-12 14:24:45 -0700 |
| commit | 7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6 (patch) | |
| tree | e5f559b44e859e7f9bddd0a022d3be9849434b51 /mod | |
| parent | 5fd0d6f7d553d79e2362a480ec504d102b299fd0 (diff) | |
| parent | 61ce524a33c3195794a24c4ce5820684369c58dd (diff) | |
| download | volse-hubzilla-7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6.tar.gz volse-hubzilla-7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6.tar.bz2 volse-hubzilla-7fc1a66121e2f98aeb455e6eafd93cbc72fd03e6.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/settings.php | 2 | ||||
| -rw-r--r-- | mod/webpages.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/settings.php b/mod/settings.php index d6ebf9e90..a31814bf0 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -589,7 +589,7 @@ function settings_content(&$a) { if((argc() > 1) && (argv(1) === 'featured')) { $settings_addons = ""; - $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); + $r = q("SELECT * FROM `hook` WHERE `hook` = 'feature_settings' "); if(! count($r)) $settings_addons = t('No feature settings configured'); diff --git a/mod/webpages.php b/mod/webpages.php index 1b906a97f..efaf3c4bf 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -46,7 +46,7 @@ function webpages_content(&$a) { // } - if(feature_enabled($owner,'expert_mode')) { + if(feature_enabled($owner,'expert')) { $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); if(! $mimetype) $mimetype = 'choose'; |