aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Blocks.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-09 22:00:21 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-09 22:00:21 -0400
commit0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be (patch)
tree2e4f069d66885c5ca5b77154e9dd5a43ec004ff5 /Zotlabs/Module/Blocks.php
parent9c8cf7d43372aeea4d8a450e7cb17d7a24b64d5f (diff)
parentea1173f8f632151d02c71fe6004c6a64d014e80a (diff)
downloadvolse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.gz
volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.bz2
volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'Zotlabs/Module/Blocks.php')
-rw-r--r--Zotlabs/Module/Blocks.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Module/Blocks.php b/Zotlabs/Module/Blocks.php
index 192a4aded..ed702befb 100644
--- a/Zotlabs/Module/Blocks.php
+++ b/Zotlabs/Module/Blocks.php
@@ -82,11 +82,7 @@ class Blocks extends \Zotlabs\Web\Controller {
}
$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
-
- if(! $mimetype) {
- $mimetype = 'choose';
- }
-
+
$x = array(
'webpage' => ITEM_TYPE_BLOCK,
'is_owner' => true,
@@ -96,6 +92,8 @@ class Blocks extends \Zotlabs\Web\Controller {
'showacl' => false,
'visitor' => true,
'mimetype' => $mimetype,
+ 'mimeselect' => true,
+ 'hide_location' => true,
'ptlabel' => t('Block Name'),
'profile_uid' => intval($owner),
'expanded' => true,