Merge branch 'master' into tunable-fetches

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

diff --git a/include/functions.php b/include/functions.php
index fa63c9baac842df1b7c5f4ee0ebca10c48fc7037..0d9c154d625037254060d99924a3d16b3139d2b4 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
        define('EXPECTED_CONFIG_VERSION', 26);
-       define('SCHEMA_VERSION', 111);
+       define('SCHEMA_VERSION', 114);
 
        define('LABEL_BASE_INDEX', -1024);
        define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -60,9 +60,10 @@
                                        "nb_NO" => "Norwegian bokmål",
                                        "nl_NL" => "Dutch",
                                        "pl_PL" => "Polski",
-                                       "ru_RU" => "Русский",
+//                                     "ru_RU" => "Русский",
                                        "pt_BR" => "Portuguese/Brazil",
-                                       "zh_CN" => "Simplified Chinese");
+                                       "zh_CN" => "Simplified Chinese",
+                                       "fi_FI" => "Suomi");
 
                return $tr;
        }
@@ -3192,7 +3193,7 @@
                $cat_id = (int)getFeedCategory($link, $feed_id);
 
                $result = db_query($link, "SELECT * FROM ttrss_filters2 WHERE
-                       owner_uid = $owner_uid AND enabled = true");
+                       owner_uid = $owner_uid AND enabled = true ORDER BY order_id, title");
 
                $check_cats = join(",", array_merge(
                        getParentCategories($link, $cat_id, $owner_uid),