Merge branch 'master' into pdo

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);