harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Browse Source
This commit is contained in:
Mario Vavti 2016-07-07 20:39:52 +02:00
commit 0b2ad9deca
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Daemon/Expire.php
View File

@ -38,7 +38,7 @@ class Expire {
logger('site_expire: ' . $site_expire); logger('site_expire: ' . $site_expire);
$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true"); $r = q("SELECT channel_id, channel_system, channel_address, channel_expire_days from channel where true");
if ($r) { if ($r) {
foreach ($r as $rr) { foreach ($r as $rr) {

27
include/items.php
View File

@ -3286,15 +3286,17 @@ function item_expire($uid,$days) {
$item_normal = item_normal(); $item_normal = item_normal();
$r = q("SELECT * FROM `item` $r = q("SELECT id FROM item
WHERE `uid` = %d WHERE uid = %d
AND `created` < %s - INTERVAL %s AND created < %s - INTERVAL %s
AND `id` = `parent`
$sql_extra
AND item_retained = 0 AND item_retained = 0
$item_normal LIMIT $expire_limit ", AND item_thread_top = 1
AND resource_type = ''
AND item_starred = 0
$sql_extra $item_normal LIMIT $expire_limit ",
intval($uid), intval($uid),
db_utcnow(), db_quoteinterval(intval($days).' DAY') db_utcnow(),
db_quoteinterval(intval($days).' DAY')
); );
if(! $r) if(! $r)
@ -3312,17 +3314,6 @@ function item_expire($uid,$days) {
continue; continue;
} }
// Only expire posts, not photos and photo comments
if($item['resource_type'] === 'photo') {
retain_item($item['id']);
continue;
}
if(intval($item['item_starred'])) {
retain_item($item['id']);
continue;
}
drop_item($item['id'],false); drop_item($item['id'],false);
} }