diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-09 12:17:19 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-09 12:17:19 +0100 |
| commit | af34cf019c5742abadab19586f3931353d8d3ff8 (patch) | |
| tree | e788b55ff2bbe256d62e517d04ef25e8630313b3 /include/security.php | |
| parent | f84c191f8df126b95d8a41f70e785a9592018390 (diff) | |
| parent | 42d622d6bfb5768205573cb6b149340d28f46886 (diff) | |
| download | volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.tar.gz volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.tar.bz2 volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'include/security.php')
| -rwxr-xr-x | include/security.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/security.php b/include/security.php index 9042d4d64..8c536b656 100755 --- a/include/security.php +++ b/include/security.php @@ -271,7 +271,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) } $sql = sprintf( - " AND ( private = 0 OR (( allow_cid = '' OR allow_cid REGEXP '<%d>' ) + " AND ( private = 0 OR ( private = 1 AND wall = 1 AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s'))) @@ -283,6 +283,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) ); } } + return $sql; } |