aboutsummaryrefslogtreecommitdiffstats
path: root/include/ItemObject.php
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2016-01-10 09:44:43 +0100
committermrjive <mrjive@mrjive.it>2016-01-10 09:44:43 +0100
commit9cbbc92062f0e42e32881a972a234a6c25758c37 (patch)
treead7c9ba78f82aa67ba6c4846a857dfd9c7355cdd /include/ItemObject.php
parent0fa34c6880853e64b88749bcf9cc9b9e8c9a198b (diff)
parent23c7086605d54fc6d9a537b20fc3377a52b24ee8 (diff)
downloadvolse-hubzilla-9cbbc92062f0e42e32881a972a234a6c25758c37.tar.gz
volse-hubzilla-9cbbc92062f0e42e32881a972a234a6c25758c37.tar.bz2
volse-hubzilla-9cbbc92062f0e42e32881a972a234a6c25758c37.zip
Merge pull request #13 from redmatrix/master
updating from original codebase
Diffstat (limited to 'include/ItemObject.php')
-rw-r--r--include/ItemObject.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 8be99d91e..1b7b2ce78 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -264,7 +264,7 @@ class Item extends BaseObject {
if($keep_reports === 0)
$keep_reports = 30;
- if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0)
+ if((! get_config('system','disable_dreport')) && strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0)
$dreport = t('Delivery Report');
if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)