From Tobias H - catch some irregularities caused by cut/paste code

diff --git a/boot.php b/boot.php
index c3e5c0de02214d27e4948c5927f747948a16e291..e1dc7e5373115177076add5c1d697a3af7df53c0 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.1265' );
+define ( 'FRIENDICA_VERSION',      '2.3.1266' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1129      );
 

diff --git a/include/items.php b/include/items.php
index 7d52571c25d6a176d32a0b70540df807102ac2ed..250d023cec1b2687a630dda4d0da7815b34b89fc 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -2424,7 +2424,7 @@ function local_delivery($importer,$data) {
                        // This is my contact on another system, but it's really me.
                        // Turn this into a wall post.
 
-                       if($contact['remote_self'])
+                       if($importer['remote_self'])
                                $datarray['wall'] = 1;
 
                        $datarray['parent-uri'] = $item_id;

diff --git a/mod/display.php b/mod/display.php
index d96be4333bebc2ac4af56d47da159c07bf29e967..f510f793df9d98b2e05356ab6c0b387da0b5a515 100755 (executable)
--- a/mod/display.php
+++ b/mod/display.php
@@ -74,11 +74,11 @@ function display_content(&$a) {
                $x = array(
                        'is_owner' => true,
                        'allow_location' => $a->user['allow_location'],
-                       'default_location' => $a->user['default_location'],
+                       'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
-                       'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-                       'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
-                       'bang' => (($group || $cid) ? '!' : ''),
+                       'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
+                       'acl' => populate_acl($a->user, $celeb),
+                       'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user()
                );      

diff --git a/mod/network.php b/mod/network.php
index 03a671b6157d51dc7939dfbfa024eb6ca9bf7fe2..894ac48ed67e3554d7265841b27f5a34b7540ad5 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -263,7 +263,7 @@ function network_content(&$a, $update = 0) {
                $x = array(
                        'is_owner' => true,
                        'allow_location' => $a->user['allow_location'],
-                       'default_location' => $a->user['default_location'],
+                       'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
                        'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),