diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-27 04:40:42 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-27 04:40:42 -0400 |
| commit | cc33a564e1658d32bb5bc3ad0abdfbe6871cf945 (patch) | |
| tree | fdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23 /include | |
| parent | c3388ad81336d45a40a66b69096f504ffa7e34cb (diff) | |
| parent | 7c6c3d36f589d38de5e8b36f2ba1d940c8150e2c (diff) | |
| download | volse-hubzilla-cc33a564e1658d32bb5bc3ad0abdfbe6871cf945.tar.gz volse-hubzilla-cc33a564e1658d32bb5bc3ad0abdfbe6871cf945.tar.bz2 volse-hubzilla-cc33a564e1658d32bb5bc3ad0abdfbe6871cf945.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
profile wall privacy
don't expire filed items
* master:
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 708fd8121..2eecadad1 100755 --- a/include/items.php +++ b/include/items.php @@ -2936,6 +2936,11 @@ function item_expire($uid,$days) { foreach($r as $item) { + // don't expire filed items + + if(strpos($item['file'],'[') !== false) + continue; + // Only expire posts, not photos and photo comments if($expire_photos==0 && strlen($item['resource-id'])) |