From f4c02a157a51c44c9772e609fcf0e360db42d060 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 28 Feb 2013 09:13:00 +0400 Subject: fix warning when saving plugins with 0 plugins enabled (closes #542) --- classes/pref/prefs.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes/pref') diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index eb84bde99..810b1e164 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -824,7 +824,10 @@ class Pref_Prefs extends Handler_Protected { } function setplugins() { - $plugins = join(",", $_REQUEST["plugins"]); + if (is_array($_REQUEST["plugins"])) + $plugins = join(",", $_REQUEST["plugins"]); + else + $plugins = ""; set_pref($this->link, "_ENABLED_PLUGINS", $plugins); } -- cgit v1.2.3-54-g00ecf From 350e3944d49ad26802e27e64057212d88c4d0bf9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 28 Feb 2013 09:17:17 +0400 Subject: fix uploadicon() returning wrong content-type (closes #543) --- classes/pref/feeds.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes/pref') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index da8d68ba1..2ed7b1b24 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -437,6 +437,8 @@ class Pref_Feeds extends Handler_Protected { } function uploadicon() { + header("Content-type: text/html"); + $icon_file = $_FILES['icon_file']['tmp_name']; $feed_id = db_escape_string($_REQUEST["feed_id"]); -- cgit v1.2.3-54-g00ecf