diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-19 17:53:52 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-19 17:53:52 -0700 |
| commit | ec00c5b18a1efea64517b18fa12bb9df6f0b95f7 (patch) | |
| tree | 8a0bc1c5d6e920bbc32b0deaa25f7d3be677a2b3 /include/conversation.php | |
| parent | ed3d9d1f80773417b0fba491ed762b90be340863 (diff) | |
| download | volse-hubzilla-ec00c5b18a1efea64517b18fa12bb9df6f0b95f7.tar.gz volse-hubzilla-ec00c5b18a1efea64517b18fa12bb9df6f0b95f7.tar.bz2 volse-hubzilla-ec00c5b18a1efea64517b18fa12bb9df6f0b95f7.zip | |
the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php index 65056bc9c..d14d7ba84 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1168,7 +1168,7 @@ function status_editor($a, $x, $popup = false) { '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$id_select' => $id_select, '$id_seltext' => t('Post as'), - '$writefiles' => (perm_is_allowed($x['profile_uid'], get_observer_hash(), 'post_photos') || perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage')), + '$writefiles' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage'), '$bold' => t('Bold'), '$italic' => t('Italic'), '$underline' => t('Underline'), @@ -1587,7 +1587,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ 'id' => 'profile-tab', ); } - if ($p['view_photos']) { + if ($p['view_storage']) { $tabs[] = array( 'label' => t('Photos'), 'url' => $a->get_baseurl() . '/photos/' . $nickname, @@ -1595,8 +1595,6 @@ function profile_tabs($a, $is_owner = false, $nickname = null){ 'title' => t('Photo Albums'), 'id' => 'photo-tab', ); - } - if ($p['view_storage']) { $tabs[] = array( 'label' => t('Files'), 'url' => $a->get_baseurl() . '/cloud/' . $nickname . ((get_observer_hash()) ? '' : '?f=&davguest=1'), |