diff options
| author | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
|---|---|---|
| committer | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
| commit | d9c042c4c536f1afbf206aeea09b0b127b7b6418 (patch) | |
| tree | 9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4 /include/functions.php | |
| parent | cf42b79120290ee5866136a0c4656e6999f06045 (diff) | |
| parent | 4ca621a36016de1fbb5447e1c1de0b607ba94a7c (diff) | |
Merge branch 'master' into patch-1
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/functions.php b/include/functions.php index d783bd853..35124ba08 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ <?php define('EXPECTED_CONFIG_VERSION', 26); - define('SCHEMA_VERSION', 126); + define('SCHEMA_VERSION', 127); define('LABEL_BASE_INDEX', -1024); define('PLUGIN_FEED_BASE_INDEX', -128); @@ -14,6 +14,8 @@ $fetch_curl_used = false; $suppress_debugging = false; + libxml_disable_entity_loader(true); + mb_internal_encoding("UTF-8"); date_default_timezone_set('UTC'); if (defined('E_DEPRECATED')) { @@ -357,6 +359,9 @@ $url = ltrim($url, ' '); $url = str_replace(' ', '%20', $url); + if (strpos($url, "//") === 0) + $url = 'http:' . $url; + if (!defined('NO_CURL') && function_exists('curl_init')) { $fetch_curl_used = true; @@ -403,10 +408,6 @@ curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query); } - if ((OPENSSL_VERSION_NUMBER >= 0x0090808f) && (OPENSSL_VERSION_NUMBER < 0x10000000)) { - curl_setopt($ch, CURLOPT_SSLVERSION, 3); - } - if ($login && $pass) curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass"); @@ -805,10 +806,6 @@ function initialize_user($uid) { db_query("insert into ttrss_feeds (owner_uid,title,feed_url) - values ('$uid', 'Tiny Tiny RSS: New Releases', - 'http://tt-rss.org/releases.rss')"); - - db_query("insert into ttrss_feeds (owner_uid,title,feed_url) values ('$uid', 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php')"); } |