From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 15 May 2012 18:00:43 +0000 (+0400)
Subject: fix broken feed icon upload (closes #459)
X-Git-Tag: 1.5.11~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=35b9844be1b05e1d75646f53dc080d106ab5770e;p=tt-rss.git

fix broken feed icon upload (closes #459)
---

diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index 4182c919..db1161c3 100644
--- a/classes/pref_feeds.php
+++ b/classes/pref_feeds.php
@@ -3,7 +3,7 @@ class Pref_Feeds extends Protected_Handler {
 
 	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "getfeedtree", "add", "editcats", "editfeed",
-			"savefeedorder");
+			"savefeedorder", "uploadicon");
 
 		return array_search($method, $csrf_ignored) !== false;
 	}
diff --git a/js/functions.js b/js/functions.js
index 4a4602f9..6d2a5829 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -795,7 +795,7 @@ function removeFeedIcon(id) {
 
 		return false;
 	} catch (e) {
-		exception_error("uploadFeedIcon", e);
+		exception_error("removeFeedIcon", e);
 	}
 }