From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 9 Nov 2010 07:03:27 +0000 (+0100)
Subject: move url resolution before duplicate checks - otherwise we may get duplicates (refs... 
X-Git-Tag: 1.5.0~328
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f6d8345b0139ac4e86ea11f2183903a387a2a9fe;p=tt-rss.git

move url resolution before duplicate checks - otherwise we may get duplicates (refs #276)
---

diff --git a/functions.php b/functions.php
index c4d033bc..fa97d04f 100644
--- a/functions.php
+++ b/functions.php
@@ -2998,6 +2998,15 @@
 		$url = fix_url($url);
 		if (!validate_feed_url($url)) return 2;
 
+		if (url_is_html($url)) {
+			$feedUrls = get_feeds_from_html($url);
+			if (count($feedUrls) != 1) {
+				return 3;
+			}
+			//use feed url as new URL
+			$url = key($feedUrls);
+		}
+
 		if ($cat_id == "0" || !$cat_id) {
 			$cat_qpart = "NULL";
 		} else {
@@ -3009,15 +3018,6 @@
 			WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
 	
 		if (db_num_rows($result) == 0) {
-			if (url_is_html($url)) {
-				$feedUrls = get_feeds_from_html($url);
-				if (count($feedUrls) != 1) {
-					return 3;
-				}
-				//use feed url as new URL
-				$url = key($feedUrls);
-			}
-			
 			$result = db_query($link,
 				"INSERT INTO ttrss_feeds 
 					(owner_uid,feed_url,title,cat_id, auth_login,auth_pass)