diff options
| author | mrjive <mrjive@mrjive.it> | 2015-04-15 11:19:25 +0200 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-04-15 11:19:25 +0200 |
| commit | 7b467d6ca7a27bd83388627f16df96b47963c42f (patch) | |
| tree | 76c7ba2286bb8cb3c031137f394cc3bd02b84c73 /mod/blocks.php | |
| parent | 865b602cf8b4eff5e7da00362df95e52e2fe4f77 (diff) | |
| parent | 834044b15bf4cd3f436f065449cbc0ed76b4de93 (diff) | |
| download | volse-hubzilla-7b467d6ca7a27bd83388627f16df96b47963c42f.tar.gz volse-hubzilla-7b467d6ca7a27bd83388627f16df96b47963c42f.tar.bz2 volse-hubzilla-7b467d6ca7a27bd83388627f16df96b47963c42f.zip | |
Merge pull request #1 from redmatrix/master
2015-04-15_1
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, |