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/blocks.php | |
| 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/blocks.php')
| -rw-r--r-- | mod/blocks.php | 11 |
1 files changed, 3 insertions, 8 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, |