Specify feed_id as an int rather than a string.

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 0a74db85c29764a5f50c3beb973f2b00a6fe7129..3dea5677a9970515e22e546ca193e3f57737e169 100755 (executable)
--- a/include/functions.php
+++ b/include/functions.php
@@ -16,7 +16,9 @@
 
        libxml_disable_entity_loader(true);
 
-       mb_internal_encoding("UTF-8");
+       // separate test because this is included before sanity checks
+       if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8");
+
        date_default_timezone_set('UTC');
        if (defined('E_DEPRECATED')) {
                error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
@@ -343,7 +345,7 @@
                global $fetch_last_content_type;
                global $fetch_curl_used;
 
-               if (!is_array($options) && func_num_args() > 1) {
+               if (!is_array($options)) {
 
                        // falling back on compatibility shim
                        $options = array(
@@ -831,14 +833,17 @@
                return $csrf_token == $_SESSION['csrf_token'];
        }
 
-       function load_user_plugins($owner_uid) {
+       function load_user_plugins($owner_uid, $pluginhost = false) {
+
+               if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+
                if ($owner_uid && SCHEMA_VERSION >= 100) {
                        $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-                       PluginHost::getInstance()->load($plugins, PluginHost::KIND_USER, $owner_uid);
+                       $pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid);
 
                        if (get_schema_version() > 100) {
-                               PluginHost::getInstance()->load_data();
+                               $pluginhost->load_data();
                        }
                }
        }
@@ -1767,9 +1772,9 @@
                                set_basic_feed_info($feed_id);
                        }
 
-                       return array("code" => 1);
+                       return array("code" => 1, "feed_id" => (int) $feed_id);
                } else {
-                       return array("code" => 0);
+                       return array("code" => 0, "feed_id" => (int) db_fetch_result($result, 0, "id"));
                }
        }