From bf2a97147ecef7528e9adbed3cf4a1f3af03ad72 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Apr 2015 11:50:21 +0200
Subject: some more on webpages

---
 mod/editwebpage.php | 2 +-
 mod/webpages.php    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'mod')

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..2b284813a 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -70,10 +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';
+	$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
+
+	if(! $mimetype) {
+		$mimetype = 'choose';
 	}
 	else {
 		$mimetype = 'text/bbcode';
-- 
cgit v1.2.3


From 953819e7da8152f959f04c733ce617cc34cf8c7d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Apr 2015 12:52:31 +0200
Subject: css fixes and remove expert mode for block page content type

---
 mod/blocks.php   | 11 +++--------
 mod/webpages.php |  3 ---
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'mod')

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)
-- 
cgit v1.2.3