strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
friendica 2012-02-28 14:52:23 -08:00
parent 53412dacd4
commit 4dd4a22582
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1265' ); define ( 'FRIENDICA_VERSION', '2.3.1266' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1129 ); define ( 'DB_UPDATE_VERSION', 1129 );

2
include/items.php
View file

@ -2424,7 +2424,7 @@ function local_delivery($importer,$data) {
// This is my contact on another system, but it's really me. // This is my contact on another system, but it's really me.
// Turn this into a wall post. // Turn this into a wall post.
if($contact['remote_self']) if($importer['remote_self'])
$datarray['wall'] = 1; $datarray['wall'] = 1;
$datarray['parent-uri'] = $item_id; $datarray['parent-uri'] = $item_id;

8
mod/display.php
View file

@ -74,11 +74,11 @@ function display_content(&$a) {
$x = array( $x = array(
'is_owner' => true, 'is_owner' => true,
'allow_location' => $a->user['allow_location'], 'allow_location' => $a->user['allow_location'],
'default_location' => $a->user['default_location'], 'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'], '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'), '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((($group || $cid) ? $def_acl : $a->user), $celeb), 'acl' => populate_acl($a->user, $celeb),
'bang' => (($group || $cid) ? '!' : ''), 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user() 'profile_uid' => local_user()
); );

2
mod/network.php
View file

@ -263,7 +263,7 @@ function network_content(&$a, $update = 0) {
$x = array( $x = array(
'is_owner' => true, 'is_owner' => true,
'allow_location' => $a->user['allow_location'], 'allow_location' => $a->user['allow_location'],
'default_location' => $a->user['default_location'], 'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'], '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'), '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), 'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),