increase content font size by 1px

[tt-rss.git] / classes / pref / prefs.php

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 41dc536f500e1a903853720fee45ed30d40b3ecf..1988649a5a0e7d6c74a5f13f71e49e609b3a3732 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -164,7 +164,7 @@ class Pref_Prefs extends Handler_Protected {
 
                global $access_level_names;
 
-               $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
+               $prefs_blacklist = array("ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
                        "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT",
                        "FEEDS_SORT_BY_UNREAD");
 
@@ -709,6 +709,10 @@ class Pref_Prefs extends Handler_Protected {
 
                print_notice(__("Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."));
 
+               if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) {
+                       print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
+               }
+
                print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
 
                print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
@@ -746,7 +750,7 @@ class Pref_Prefs extends Handler_Protected {
                $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
                $tmppluginhost = new PluginHost();
-               $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
+               $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
                $tmppluginhost->load_data(true);
 
                foreach ($tmppluginhost->get_plugins() as $name => $plugin) {