summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-05-15 22:00:43 +0400
committerAndrew Dolgov <[email protected]>2012-05-15 22:00:43 +0400
commit35b9844be1b05e1d75646f53dc080d106ab5770e (patch)
treeffb7fdc6d139185bdd12e5876f762a2ac056d574
parent882311d9ad0092127ccaecd700cb659cebb89aa8 (diff)
fix broken feed icon upload (closes #459)
-rw-r--r--classes/pref_feeds.php2
-rw-r--r--js/functions.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index 4182c9199..db1161c35 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 4a4602f9e..6d2a58294 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);
}
}