diff options
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/include/functions.php b/include/functions.php index f6ef7c2b3..f0bd31831 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ <?php define('EXPECTED_CONFIG_VERSION', 26); - define('SCHEMA_VERSION', 100); + define('SCHEMA_VERSION', 101); $fetch_last_error = false; $pluginhost = false; @@ -547,25 +547,6 @@ if (!SINGLE_USER_MODE) { $user_id = false; - /* $modules = explode(",", AUTH_MODULES); - - foreach ($modules as $module) { - $module_class = "auth_$module"; - if (class_exists($module_class)) { - $authenticator = new $module_class($link); - - $user_id = (int) $authenticator->authenticate($login, $password); - - if ($user_id) { - $_SESSION["auth_module"] = $module; - break; - } - - } else { - print T_sprintf("Fatal: authentication module %s not found.", $module); - die; - } - } */ global $pluginhost; foreach ($pluginhost->get_hooks($pluginhost::HOOK_AUTH_USER) as $plugin) { @@ -727,7 +708,11 @@ $plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid); global $pluginhost; - $pluginhost->load($plugins, $pluginhost::KIND_USER); + $pluginhost->load($plugins, $pluginhost::KIND_USER, $owner_uid); + + if (get_schema_version($link) > 100) { + $pluginhost->load_data(); + } } } @@ -2590,7 +2575,8 @@ $node = $doc->getElementsByTagName('body')->item(0); - return $doc->saveXML($node); //LIBXML_NOEMPTYTAG + // http://tt-rss.org/redmine/issues/357 + return $doc->saveXML($node, LIBXML_NOEMPTYTAG); } function check_for_update($link) { @@ -4690,17 +4676,6 @@ } -/* function rewrite_urls($line) { - global $url_regex; - - $urls = null; - - $result = preg_replace("/((?<!=.)((http|https|ftp)+):\/\/[^ ,!]+)/i", - "<a target=\"_blank\" href=\"\\1\">\\1</a>", $line); - - return $result; - } */ - function rewrite_urls($html) { libxml_use_internal_errors(true); |