diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-14 16:22:59 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-14 16:22:59 -0700 |
| commit | 89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e (patch) | |
| tree | adf4be41d5a98588836b5e9bf49c34177806c9f4 /mod | |
| parent | 3a45206b9971ee981ea61de31c8413350ebcdd7b (diff) | |
| parent | 953819e7da8152f959f04c733ce617cc34cf8c7d (diff) | |
| download | volse-hubzilla-89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e.tar.gz volse-hubzilla-89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e.tar.bz2 volse-hubzilla-89536ff88bcb9ca74ace4d7a74d6a4214d88ed2e.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/blocks.php | 11 | ||||
| -rw-r--r-- | mod/editwebpage.php | 2 | ||||
| -rw-r--r-- | mod/webpages.php | 11 |
3 files changed, 8 insertions, 16 deletions
diff --git a/mod/blocks.php b/mod/blocks.php index 1b7a3588f..e0f32f4f1 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -78,16 +78,11 @@ function blocks_content(&$a) { return; } + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); - if(feature_enabled($owner,'expert')) { - $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); - if(! $mimetype) - $mimetype = 'choose'; + if(! $mimetype) { + $mimetype = 'choose'; } - else { - $mimetype = 'text/bbcode'; - } - $x = array( 'webpage' => ITEM_BUILDBLOCK, diff --git a/mod/editwebpage.php b/mod/editwebpage.php index e81cde479..e30a33171 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -126,7 +126,7 @@ function editwebpage_content(&$a) { $plaintext = true; if(get_config('system','page_mimetype')) - $mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />'; + $mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />'; else $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); diff --git a/mod/webpages.php b/mod/webpages.php index b4c4e6e4e..e2b5eb3a4 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -70,13 +70,10 @@ function webpages_content(&$a) { return; } - if(feature_enabled($owner,'expert') || $a->is_sys) { - $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); - if(! $mimetype) - $mimetype = 'choose'; - } - else { - $mimetype = 'text/bbcode'; + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); + + if(! $mimetype) { + $mimetype = 'choose'; } $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); |