diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-12 19:52:21 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-12 19:52:21 -0700 |
| commit | fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3 (patch) | |
| tree | c2fc54947e733056820a87ac8401839647be69de /include/attach.php | |
| parent | 6a7079a594bbfa1238fe0bef0dfe265720c2cb4d (diff) | |
| parent | 3545626950a03f662a16ff3c1b589f2901c9948e (diff) | |
| download | volse-hubzilla-fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3.tar.gz volse-hubzilla-fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3.tar.bz2 volse-hubzilla-fc28af8518a422ff1b0a45b8ef006da7bd6d4eb3.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/attach.php
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/attach.php b/include/attach.php index 50f1d2be7..a556ff775 100644 --- a/include/attach.php +++ b/include/attach.php @@ -181,7 +181,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $ $ret = array('success' => false); - if(! perm_is_allowed($channel_id,$observer, 'read_storage')) { + if(! perm_is_allowed($channel_id,$observer, 'view_storage')) { $ret['message'] = t('Permission denied.'); return $ret; } @@ -203,7 +203,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $ // Retrieve all columns except 'data' - $r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra $orderby $limit", + $r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit", intval($channel_id) ); |