From 759e5132a1311a1b56787b97e82ddad4b5348aa1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 23 Sep 2012 13:38:58 +0400
Subject: subscribe_to_feed: stop fetching URL multiple times while
 subscribing, various other speedups

---
 classes/handler/public.php | 2 +-
 classes/rpc.php            | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'classes')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index b9972df4f..7cb465594 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -553,7 +553,7 @@ class Handler_Public extends Handler {
 				break;
 			case 4:
 				print_notice(__("Multiple feed URLs found."));
-				$feed_urls = get_feeds_from_html($feed_url);
+				$feed_urls = $rc["feeds"];
 				break;
 			case 5:
 				print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
diff --git a/classes/rpc.php b/classes/rpc.php
index c4d0cd53c..f0d1d3d86 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -195,12 +195,6 @@ class RPC extends Handler_Protected {
 		print json_encode(array("result" => $rc));
 	}
 
-	function extractfeedurls() {
-		$urls = get_feeds_from_html($_REQUEST['url']);
-
-		print json_encode(array("urls" => $urls));
-	}
-
 	function togglepref() {
 		$key = db_escape_string($_REQUEST["key"]);
 		set_pref($this->link, $key, !get_pref($this->link, $key));
-- 
cgit v1.2.3-54-g00ecf