aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-14 12:52:31 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-14 12:52:31 +0200
commit953819e7da8152f959f04c733ce617cc34cf8c7d (patch)
treef44e693f963672548083432b5b072aa996fef594 /mod
parent2001ad94bd16c283b2cc79d8e48646d61acb5a77 (diff)
downloadvolse-hubzilla-953819e7da8152f959f04c733ce617cc34cf8c7d.tar.gz
volse-hubzilla-953819e7da8152f959f04c733ce617cc34cf8c7d.tar.bz2
volse-hubzilla-953819e7da8152f959f04c733ce617cc34cf8c7d.zip
css fixes and remove expert mode for block page content type
Diffstat (limited to 'mod')
-rw-r--r--mod/blocks.php11
-rw-r--r--mod/webpages.php3
2 files changed, 3 insertions, 11 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/webpages.php b/mod/webpages.php
index 2b284813a..e2b5eb3a4 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -75,9 +75,6 @@ function webpages_content(&$a) {
if(! $mimetype) {
$mimetype = 'choose';
}
- else {
- $mimetype = 'text/bbcode';
- }
$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
if(! $layout)