diff options
| author | friendica <info@friendica.com> | 2014-04-01 14:54:51 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-01 14:54:51 -0700 |
| commit | 8d818280fd2c4424e72fd079dfe93c875931aefb (patch) | |
| tree | 1e9e8f1fa5fb048daa824131375d4dfd1c22760a | |
| parent | 6ba32d714dd40c530aa40d1ae25dddb25a262a36 (diff) | |
| parent | 5ae20dd59a8cdc26514c6fe4e1ab00de57e1e6a8 (diff) | |
| download | volse-hubzilla-8d818280fd2c4424e72fd079dfe93c875931aefb.tar.gz volse-hubzilla-8d818280fd2c4424e72fd079dfe93c875931aefb.tar.bz2 volse-hubzilla-8d818280fd2c4424e72fd079dfe93c875931aefb.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | include/identity.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php index eb0ba230b..d15f3861e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -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) ); |