diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-13 00:10:41 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-13 00:10:41 +0200 |
| commit | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (patch) | |
| tree | e59df4f38865c14111d5460e85192759380786a8 /include/items.php | |
| parent | 138caa4380c442200964c8cf071438a0be89da70 (diff) | |
| parent | e3af552bbfff2632bbcf2ce94c3e08ad4a5142d2 (diff) | |
| download | volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.tar.gz volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.tar.bz2 volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.zip | |
Merge commit 'upstream/master'
Conflicts:
include/dba.php
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 ", |