diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-10 15:27:55 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-10 22:19:51 -0700 |
| commit | 2f2bd03b152b84612f8c7c8ce21a0713ed22bead (patch) | |
| tree | 004d0a461290f279092d835ffb14f5a544ef334e | |
| parent | 53363d680831265d53594b491c35881c0247ad91 (diff) | |
| download | volse-hubzilla-2f2bd03b152b84612f8c7c8ce21a0713ed22bead.tar.gz volse-hubzilla-2f2bd03b152b84612f8c7c8ce21a0713ed22bead.tar.bz2 volse-hubzilla-2f2bd03b152b84612f8c7c8ce21a0713ed22bead.zip | |
fixes for immediate expire, channel_active not initialised in DB
| -rw-r--r-- | include/channel.php | 1 | ||||
| -rwxr-xr-x | include/items.php | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/channel.php b/include/channel.php index 4bf490bf0..11a5c5e63 100644 --- a/include/channel.php +++ b/include/channel.php @@ -2343,6 +2343,7 @@ function channel_store_lowlevel($arr) { 'channel_dirdate' => ((array_key_exists('channel_dirdate',$arr)) ? $arr['channel_dirdate'] : NULL_DATE), 'channel_lastpost' => ((array_key_exists('channel_lastpost',$arr)) ? $arr['channel_lastpost'] : NULL_DATE), 'channel_deleted' => ((array_key_exists('channel_deleted',$arr)) ? $arr['channel_deleted'] : NULL_DATE), + 'channel_active' => ((array_key_exists('channel_active',$arr)) ? $arr['channel_active'] : NULL_DATE), 'channel_max_anon_mail' => ((array_key_exists('channel_max_anon_mail',$arr)) ? $arr['channel_max_anon_mail'] : '10'), 'channel_max_friend_req' => ((array_key_exists('channel_max_friend_req',$arr)) ? $arr['channel_max_friend_req'] : '10'), 'channel_expire_days' => ((array_key_exists('channel_expire_days',$arr)) ? $arr['channel_expire_days'] : '0'), diff --git a/include/items.php b/include/items.php index 90154bce0..0b8ec7075 100755 --- a/include/items.php +++ b/include/items.php @@ -3765,10 +3765,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) { ); } else { - $r = q("UPDATE item SET item_deleted = 1, body = '', title = '', - changed = '%s', edited = '%s' WHERE id = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), + $r = q("DELETE FROM item WHERE id = %d", intval($item['id']) ); } |