revup

diff --git a/boot.php b/boot.php
index ea21782319fae4c8cd0dbee1baf5bb8d9708c9fc..4557f2f3900ca891c514d884999942b02887d3aa 100755 (executable)
--- 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 9042d4d6436474ca46beb6bd61c5753d4ac4d45e..f469dad66f93cb4f11b1ce7f072e1280d80d5fdc 100755 (executable)
--- 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')))