fix broken feed icon upload (closes #459)

diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index 4182c9199b10030199054cfdb9b9be1b8fd5d3b6..db1161c35ef2f4212b0cb0afa594dad0f2c750b6 100644 (file)
--- 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 4a4602f9ed42fbe7d801e3cf6fc8d2322274fb91..6d2a5829427918c4135b8bdfb891144cf66d6c37 100644 (file)
--- 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);
        }
 }