diff options
Diffstat (limited to 'include')
-rwxr-xr-x | include/functions.php | 2 | ||||
-rwxr-xr-x | include/functions2.php | 3 | ||||
-rwxr-xr-x | include/rssfuncs.php | 5 | ||||
-rw-r--r-- | include/version.php | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index b928a030d..b558b0e6c 100755 --- a/include/functions.php +++ b/include/functions.php @@ -347,7 +347,7 @@ if (strpos($url, "//") === 0) $url = 'http:' . $url; - if (!defined('NO_CURL') && function_exists('curl_init')) { + if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) { $fetch_curl_used = true; diff --git a/include/functions2.php b/include/functions2.php index 63b11717e..92ed3f340 100755 --- a/include/functions2.php +++ b/include/functions2.php @@ -1121,7 +1121,8 @@ $result = db_query("SELECT tag_cache FROM ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = $owner_uid"); - $tag_cache = db_fetch_result($result, 0, "tag_cache"); + if (db_num_rows($result) != 0) + $tag_cache = db_fetch_result($result, 0, "tag_cache"); } if ($tag_cache) { diff --git a/include/rssfuncs.php b/include/rssfuncs.php index ad956cd2a..fcecbf670 100755 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -399,6 +399,11 @@ // fetch feed from source if (!$feed_data) { _debug("fetching [$fetch_url]...", $debug_enabled); + + if (ini_get("open_basedir") && function_exists("curl_init")) { + _debug("not using CURL due to open_basedir restrictions"); + } + _debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled); $feed_data = fetch_file_contents($fetch_url, false, diff --git a/include/version.php b/include/version.php index 686da3517..dfef9da57 100644 --- a/include/version.php +++ b/include/version.php @@ -1,5 +1,5 @@ <?php - define('VERSION_STATIC', '15.7'); + define('VERSION_STATIC', '16.1'); function get_version() { date_default_timezone_set('UTC'); |