diff options
author | Andrew Dolgov <[email protected]> | 2013-04-18 00:20:47 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-18 00:20:47 +0400 |
commit | c8784bceecfd4aef7240a3daf07401fb923db804 (patch) | |
tree | 57116866f33d6ec8dc91d63b0c1eb073465986a1 | |
parent | b6a74295915fb354543eadf6c1b658e15faefef7 (diff) | |
parent | 6b7bc706f3d2abd4419fb47746bad1ed4292dbce (diff) |
Merge branch 'master' into pdo
-rw-r--r-- | include/functions.php | 7 | ||||
-rwxr-xr-x | update.php | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/functions.php b/include/functions.php index 66d5896d1..8215127de 100644 --- a/include/functions.php +++ b/include/functions.php @@ -223,8 +223,6 @@ ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'"); } - $rows = pg_affected_rows($result); - } else { /* $result = db_query("DELETE FROM ttrss_user_entries WHERE @@ -239,11 +237,10 @@ feed_id = '$feed_id' AND $query_limit ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); - - $rows = mysql_affected_rows(); - } + $rows = db_affected_rows($result); + ccache_update($feed_id, $owner_uid); if ($debug) { diff --git a/update.php b/update.php index e13abafca..be7314175 100755 --- a/update.php +++ b/update.php @@ -128,7 +128,7 @@ $lock_handle = make_lockfile($lock_filename); $must_exit = false; - if (isset($options["task"])) { + if (isset($options["task"]) && isset($options["pidlock"])) { $waits = $options["task"] * 5; _debug("Waiting before update ($waits)"); sleep($waits); |