aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-10-23 00:10:49 +0000
committerrvelices <rv-github@modusoptimus.com>2007-10-23 00:10:49 +0000
commit6477e126549e08974c91706896c2dd5d46db0aa6 (patch)
treeedd98b1198ab3e4a60891c96a8fa0fa891b50800
parent6a88ab4960334d6e5e28ae08d3097de33f91b252 (diff)
merge r 2151 from branch-1_7 to trunk
- update last_check from time to time even if no news, so that we don't delete used feeds git-svn-id: http://piwigo.org/svn/trunk@2152 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--feed.php19
1 files changed, 11 insertions, 8 deletions
diff --git a/feed.php b/feed.php
index a92f2f735..9e4862722 100644
--- a/feed.php
+++ b/feed.php
@@ -117,6 +117,7 @@ $rss->link = $conf['gallery_url'];
// | Feed creation |
// +-----------------------------------------------------------------------+
+$news = array();
if (!$image_only)
{
$news = news($feed_row['last_check'], $dbnow, true, true);
@@ -151,15 +152,17 @@ UPDATE '.USER_FEED_TABLE.'
pwg_query($query);
}
}
-else
-{
- if ( !empty($feed_id) )
- {// update the last check to avoid deletion by maintenance task
+
+if ( !empty($feed_id) and empty($news) )
+{// update the last check from time to time to avoid deletion by maintenance tasks
+ if ( !isset($feed_row['last_check'])
+ or time()-mysqldt_to_ts($feed_row['last_check']) > 30*24*3600 )
+ {
$query = '
- UPDATE '.USER_FEED_TABLE.'
- SET last_check = \''.$dbnow.'\'
- WHERE id = \''.$feed_id.'\'
- ;';
+UPDATE '.USER_FEED_TABLE.'
+ SET last_check = DATE_ADD(\''.$dbnow.'\', INTERVAL -15 DAY )
+ WHERE id = \''.$feed_id.'\'
+;';
pwg_query($query);
}
}