reinstate wrongfully renamed archived feed; properly fix prefs filtertree labels...

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

diff --git a/include/functions.php b/include/functions.php
index 940a85fd08de1692a8bcbd56a3b425c526882627..8d07acf5a439916e06e2b516952158d3264cfde9 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
        define('EXPECTED_CONFIG_VERSION', 26);
-       define('SCHEMA_VERSION', 125);
+       define('SCHEMA_VERSION', 126);
 
        define('LABEL_BASE_INDEX', -1024);
        define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -68,7 +68,7 @@
                                        "cs_CZ" => "Česky",
                                        "en_US" => "English",
                                        "el_GR" => "Ελληνικά",
-                                       "es_ES" => "Españo (Españal",
+                                       "es_ES" => "Español (España)",
                                        "es_LA" => "Español",
                                        "de_DE" => "Deutsch",
                                        "fr_FR" => "Français",
@@ -1203,7 +1203,7 @@
                                                        SET unread = false, last_read = NOW() WHERE ref_id IN
                                                                (SELECT id FROM
                                                                        (SELECT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
-                                                                               AND owner_uid = $owner_uid AND unread = true AND $date_qpart AND $match_part) as tmp)");
+                                                                               AND owner_uid = $owner_uid AND score >= 0 AND unread = true AND $date_qpart AND $match_part) as tmp)");
                                        }
 
                                        if ($feed == -4) {
@@ -1972,8 +1972,6 @@
        function getFeedTitle($id, $cat = false) {
                if ($cat) {
                        return getCategoryTitle($id);
-               } else if ($id == 0) {
-                       return __("All feeds");
                } else if ($id == -1) {
                        return __("Starred articles");
                } else if ($id == -2) {