aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-01 19:20:09 -0700
committerredmatrix <git@macgirvin.com>2016-05-01 19:20:09 -0700
commit23bb4e8e1546a8f8b3319e39172cf2fd17cb4139 (patch)
tree15b7ba8f607da56f7f84ab4d1039c4768069095d /Zotlabs
parentcd518625bf561f1ed42db0b78030b74c32435136 (diff)
parentb4bf71dd0642e58fab6151e1df3c071d05650492 (diff)
downloadvolse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.gz
volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.bz2
volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Editlayout.php3
-rw-r--r--Zotlabs/Module/Layouts.php6
2 files changed, 7 insertions, 2 deletions
diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
index 2d20de52d..c5b50235a 100644
--- a/Zotlabs/Module/Editlayout.php
+++ b/Zotlabs/Module/Editlayout.php
@@ -114,6 +114,9 @@ class Editlayout extends \Zotlabs\Web\Controller {
'hide_voting' => true,
'hide_future' => true,
'hide_expire' => true,
+ 'hide_location' => true,
+ 'hide_weblink' => true,
+ 'hide_attach' => true,
'hide_preview' => true,
'ptyp' => $itm[0]['obj_type'],
'body' => undo_post_tagging($itm[0]['body']),
diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php
index aafe4342e..8a7207fc2 100644
--- a/Zotlabs/Module/Layouts.php
+++ b/Zotlabs/Module/Layouts.php
@@ -117,11 +117,13 @@ class Layouts extends \Zotlabs\Web\Controller {
'is_owner' => true,
'nickname' => \App::$profile['channel_address'],
'showacl' => false,
- 'visitor' => false,
'hide_voting' => true,
'hide_future' => true,
'hide_expire' => true,
- 'hide_preview'=> true,
+ 'hide_location' => true,
+ 'hide_weblink' => true,
+ 'hide_attach' => true,
+ 'hide_preview' => true,
'ptlabel' => t('Layout Name'),
'profile_uid' => intval($owner),
'expanded' => true,