aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-07 15:54:37 -0800
committerfriendica <info@friendica.com>2012-03-07 15:54:37 -0800
commitdd3b3c2454b98225e2251a890095e8a971fdb396 (patch)
tree3bc4557e0dde8a730ffa83852fb35efadccaf147
parent7ad2dd65654f6b1cb17ae98e65c3e95528d29e30 (diff)
downloadvolse-hubzilla-dd3b3c2454b98225e2251a890095e8a971fdb396.tar.gz
volse-hubzilla-dd3b3c2454b98225e2251a890095e8a971fdb396.tar.bz2
volse-hubzilla-dd3b3c2454b98225e2251a890095e8a971fdb396.zip
revup
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/security.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index ea2178231..4557f2f39 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1273' );
+define ( 'FRIENDICA_VERSION', '2.3.1274' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );
diff --git a/include/security.php b/include/security.php
index 9042d4d64..f469dad66 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')))