queryFeedHeadlines: remove obsolete content_preview

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

diff --git a/include/functions.php b/include/functions.php
index 663d9351be7c8c386cfb61148ea800e1d7e49cf0..f7e910ad3c986b8bcfcc9d9e3782ff3b7c38b2a6 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -378,7 +378,10 @@
                        curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
                        curl_setopt($ch, CURLOPT_ENCODING, "");
                        curl_setopt($ch, CURLOPT_REFERER, $url);
-                       curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
+
+                       if (!ini_get("safe_mode") && !ini_get("open_basedir")) {
+                               curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
+                       }
 
                        if (defined('_CURL_HTTP_PROXY')) {
                                curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);
@@ -819,6 +822,7 @@
                if (SINGLE_USER_MODE) {
                        @session_start();
                        authenticate_user("admin", null);
+                       startup_gettext();
                        load_user_plugins($_SESSION["uid"]);
                } else {
                        if (!validate_session()) $_SESSION["uid"] = false;
@@ -1140,8 +1144,8 @@
 
                                                db_query("UPDATE ttrss_user_entries
                                                        SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
-                                                               FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
-                                                               AND unread = true AND $date_qpart AND owner_uid = $owner_uid");
+                                                               FROM ttrss_user_labels2, ttrss_entries WHERE article_id = ref_id AND id = ref_id AND $date_qpart) > 0
+                                                               AND unread = true AND owner_uid = $owner_uid");
                                        }
 
                                } else if ($feed > 0) {
@@ -1454,6 +1458,7 @@
                                $from_where = "ttrss_entries.id = ttrss_user_entries.ref_id AND";
                        } else {
                                $from_qpart = "ttrss_user_entries";
+                               $from_where = "";
                        }
 
                        $query = "SELECT count(int_id) AS unread
@@ -2238,7 +2243,7 @@
 
                $search_query_part = "";
 
-               $keywords = explode(" ", $search);
+               $keywords = str_getcsv($search, " ");
                $query_keywords = array();
                $search_words = array();
 
@@ -2646,7 +2651,7 @@
                        }
 
 
-                       $content_query_part = "content, content AS content_preview, ";
+                       $content_query_part = "content, ";
 
 
                        if (is_numeric($feed)) {