only try to set fucking cookie jar if open_basedir restriction is not in effect

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 2bc30b5ce0f2fdd6ec70f82d6a9f6c647e0adb80..13d6baeab99bea508de3cde15697724ad058a338 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -175,6 +175,7 @@
                                while ($tline = db_fetch_assoc($tmp_result)) {
                                        if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
                                        update_rss_feed($tline["id"], true);
+                                       _debug_suppress(false);
                                        ++$nf;
                                }
                        }
@@ -194,6 +195,7 @@
 
                $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
+               _debug_suppress(!$debug_enabled);
                _debug("start", $debug_enabled);
 
                $result = db_query("SELECT id,update_interval,auth_login,
@@ -354,10 +356,12 @@
                        $rss->init();
                }
 
-               require_once "lib/languagedetect/LanguageDetect.php";
+               if (DETECT_ARTICLE_LANGUAGE) {
+                       require_once "lib/languagedetect/LanguageDetect.php";
 
-               $lang = new Text_LanguageDetect();
-               $lang->setNameMode(2);
+                       $lang = new Text_LanguageDetect();
+                       $lang->setNameMode(2);
+               }
 
 //             print_r($rss);
 
@@ -570,15 +574,17 @@
                                        print "\n";
                                }
 
-                               $entry_language = $lang->detect($entry_content, 1);
+                               $entry_language = "";
+
+                               if (DETECT_ARTICLE_LANGUAGE) {
+                                       $entry_language = $lang->detect($entry_title . " " . $entry_content, 1);
 
-                               if (count($entry_language) > 0) {
-                                       $entry_language = array_keys($entry_language);
-                                       $entry_language = db_escape_string(substr($entry_language[0], 0, 2));
+                                       if (count($entry_language) > 0) {
+                                               $entry_language = array_keys($entry_language);
+                                               $entry_language = db_escape_string(substr($entry_language[0], 0, 2));
 
-                                       _debug("detected language: $entry_language", $debug_enabled);
-                               } else{
-                                       $entry_language = "";
+                                               _debug("detected language: $entry_language", $debug_enabled);
+                                       }
                                }
 
                                $entry_comments = $item->get_comments_url();