aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-01 19:55:43 -0700
committerfriendica <info@friendica.com>2014-09-01 19:55:43 -0700
commit148f4e8795391d80994fe8009f161b02f57a130f (patch)
tree23dfe61f2de91547a7e49628874b73a08ba7a8a5
parent43738da24f6025fba2cdd9d2a7400f6f18cb1ca3 (diff)
downloadvolse-hubzilla-148f4e8795391d80994fe8009f161b02f57a130f.tar.gz
volse-hubzilla-148f4e8795391d80994fe8009f161b02f57a130f.tar.bz2
volse-hubzilla-148f4e8795391d80994fe8009f161b02f57a130f.zip
issue #578 - this won't fix old items but should work going forward. The extra time slop shouldn't be needed and will in fact result in possibly undesired redundancy.
-rw-r--r--include/externals.php2
-rwxr-xr-xinclude/items.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/externals.php b/include/externals.php
index 8944524b7..ad2c71ac9 100644
--- a/include/externals.php
+++ b/include/externals.php
@@ -61,7 +61,7 @@ function externals_run($argv, $argc){
if($url) {
if($r[0]['site_pull'] !== '0000-00-00 00:00:00')
- $mindate = urlencode($r[0]['site_pull']);
+ $mindate = urlencode(datetime_convert('','',$r[0]['site_pull'] . ' - 1 day'));
else {
$days = get_config('externals','since_days');
if($days === false)
diff --git a/include/items.php b/include/items.php
index 7764d2f62..ca6737f8f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4056,7 +4056,7 @@ function zot_feed($uid,$observer_xchan,$mindate) {
}
if($mindate != '0000-00-00 00:00:00') {
- $sql_extra .= " and created > '$mindate' ";
+ $sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) ";
$limit = "";
}
else