Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

2 files changed, 6 insertions, 1 deletions

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"]);
 
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);
 	}