mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 08:35:14 +00:00
Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
commit
8d818280fd
1 changed files with 7 additions and 3 deletions
|
@ -224,10 +224,13 @@ function create_identity($arr) {
|
|||
$perms_vals .= ', ' . intval($v);
|
||||
}
|
||||
|
||||
$expire = get_config('system', 'default_expire_days');
|
||||
$expire = (($expire===false)? '0': $expire);
|
||||
|
||||
$r = q("insert into channel ( channel_account_id, channel_primary,
|
||||
channel_name, channel_address, channel_guid, channel_guid_sig,
|
||||
channel_hash, channel_prvkey, channel_pubkey, channel_pageflags $perms_keys )
|
||||
values ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d $perms_vals ) ",
|
||||
channel_hash, channel_prvkey, channel_pubkey, channel_pageflags, channel_expire_days $perms_keys )
|
||||
values ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d $perms_vals ) ",
|
||||
|
||||
intval($arr['account_id']),
|
||||
intval($primary),
|
||||
|
@ -238,7 +241,8 @@ function create_identity($arr) {
|
|||
dbesc($hash),
|
||||
dbesc($key['prvkey']),
|
||||
dbesc($key['pubkey']),
|
||||
intval($pageflags)
|
||||
intval($pageflags),
|
||||
intval($expire)
|
||||
);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue