From: Andrew Dolgov <fox@bah.spb.su>
Date: Fri, 25 Nov 2005 16:10:41 +0000 (+0100)
Subject: move update_rss_feed transaction lock after $rss validity check
X-Git-Tag: schema_feature_freeze_for_1.1~86
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=dd8c76a9a2661c4f3277de96642f2b180250c9a7;p=tt-rss.git

move update_rss_feed transaction lock after $rss validity check
---

diff --git a/functions.php b/functions.php
index ba7b9e79..de164c71 100644
--- a/functions.php
+++ b/functions.php
@@ -175,12 +175,12 @@
 
 		error_reporting (DEFAULT_ERROR_LEVEL);
 
-		db_query($link, "BEGIN");
-
 		$feed = db_escape_string($feed);
 
 		if ($rss) {
 
+			db_query($link, "BEGIN");
+
 			$result = db_query($link, "SELECT title,icon_url,site_url,owner_uid 
 				FROM ttrss_feeds WHERE id = '$feed'");
 
@@ -459,6 +459,8 @@
 			db_query($link, "UPDATE ttrss_feeds 
 				SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
 
+			db_query($link, "COMMIT");
+
 		} else {
 			$error_msg = db_escape_string(magpie_error());
 			db_query($link, 
@@ -466,8 +468,6 @@
 					last_updated = NOW() WHERE id = '$feed'");
 		}
 
-		db_query($link, "COMMIT");
-
 	}
 
 	function print_select($id, $default, $values, $attributes = "") {