Merge remote-tracking branch 'upstream/dev' into plugin-repo

This commit is contained in:
Andrew Manning
2016-05-01 22:31:02 -04:00
6 changed files with 35 additions and 12 deletions
+3
View File
@@ -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']),
+4 -2
View File
@@ -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,