make Title matching default for filters, change description for filter "both"

diff --git a/backend.php b/backend.php
index 20847f00af37206e76463c39daa66fa27f257922..82b9e9b6cb9845b1bc5e4e7abf5d62ffec0b63de 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -648,7 +648,7 @@
                print "<table class=\"prefAddFeed\"><tr>
                        <td><input id=\"fadd_regexp\"></td>
                        <td>";
-                       print_select("fadd_match", "", $filter_types);  
+                       print_select("fadd_match", "Title", $filter_types);     
        
                print"</td><td colspan=\"4\" align=\"right\">
                                <a class=\"button\" href=\"javascript:addFilter()\">Add filter</a></td></tr>

diff --git a/ttrss_schema.sql b/ttrss_schema.sql
index 79a58677c28985e8c517657cffce81aa537ce503..2c00b3687ddc81b4a9815a36cb57ceda32b0c438 100644 (file)
--- a/ttrss_schema.sql
+++ b/ttrss_schema.sql
@@ -52,7 +52,7 @@ create table ttrss_filter_types (id integer primary key,
 insert into ttrss_filter_types (id,name,description) values (1, 'title', 'Title');
 insert into ttrss_filter_types (id,name,description) values (2, 'content', 'Content');
 insert into ttrss_filter_types (id,name,description) values (3, 'both', 
-       'Title and Content');
+       'Title or Content');
 
 create table ttrss_filters (id serial primary key, 
        filter_type integer not null references ttrss_filter_types(id),