diff options
author | Michael <icarus@dabo.de> | 2012-04-13 00:10:13 +0200 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-04-13 00:10:13 +0200 |
commit | 7384786d4417ddd051b7daa71c019d3c551efc68 (patch) | |
tree | 56bc56ca94ae5d11db0c3e2f67620b15527236ad /include/items.php | |
parent | 39405c8056b4a1d55c97fb2963d8776695dbeb30 (diff) | |
parent | e3af552bbfff2632bbcf2ce94c3e08ad4a5142d2 (diff) | |
download | volse-hubzilla-7384786d4417ddd051b7daa71c019d3c551efc68.tar.gz volse-hubzilla-7384786d4417ddd051b7daa71c019d3c551efc68.tar.bz2 volse-hubzilla-7384786d4417ddd051b7daa71c019d3c551efc68.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rw-r--r-- | include/items.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 3a931b68c..05c0d5016 100644 --- a/include/items.php +++ b/include/items.php @@ -2974,12 +2974,23 @@ function item_expire($uid,$days) { if($expire_items==0 && $item['type']!='note') continue; + $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($item['id']) ); + $r = q("DELETE FROM item_id where iid in (select id from item where parent = %d) and uid = %d", + intval($item['id']), + intval($uid) + ); + + $r = q("DELETE FROM sign where iid in (select id from item where parent = %d) and uid = %d", + intval($item['id']), + intval($uid) + ); + // kill the kids $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", |