diff options
| -rw-r--r-- | functions.php | 3 | ||||
| -rw-r--r-- | schema/ttrss_schema_mysql.sql | 2 | ||||
| -rw-r--r-- | schema/ttrss_schema_pgsql.sql | 2 | ||||
| -rw-r--r-- | schema/upgrade-1.2.2-1.2.3-mysql.sql | 2 | ||||
| -rw-r--r-- | schema/upgrade-1.2.2-1.2.3-pgsql.sql | 2 | ||||
| -rw-r--r-- | tt-rss.js | 2 |
6 files changed, 12 insertions, 1 deletions
diff --git a/functions.php b/functions.php index e92c638d6..a80c5bda3 100644 --- a/functions.php +++ b/functions.php @@ -2084,6 +2084,9 @@ print "<param key=\"feeds_sort_by_unread\" value=\"" . sprintf("%d", get_pref($link, "FEEDS_SORT_BY_UNREAD")) . "\"/>"; + print "<param key=\"confirm_feed_catchup\" value=\"" . + sprintf("%d", get_pref($link, "CONFIRM_FEED_CATCHUP")) . "\"/>"; + print "</init-params>"; } diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 961abe811..50c3013fb 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -263,6 +263,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1, 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3); + create table ttrss_user_prefs ( owner_uid integer not null, pref_name varchar(250), diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index b08644581..9b4988bbb 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -243,6 +243,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',1, 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address'); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3); + create table ttrss_user_prefs ( owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE, diff --git a/schema/upgrade-1.2.2-1.2.3-mysql.sql b/schema/upgrade-1.2.2-1.2.3-mysql.sql index 5839e8faa..e951f482f 100644 --- a/schema/upgrade-1.2.2-1.2.3-mysql.sql +++ b/schema/upgrade-1.2.2-1.2.3-mysql.sql @@ -6,5 +6,7 @@ update ttrss_feeds set include_in_digest = true; alter table ttrss_feeds change include_in_digest include_in_digest bool not null; alter table ttrss_feeds alter column include_in_digest set default true; +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3); + update ttrss_version set schema_version = 10; diff --git a/schema/upgrade-1.2.2-1.2.3-pgsql.sql b/schema/upgrade-1.2.2-1.2.3-pgsql.sql index 9f292ec3d..764b4b763 100644 --- a/schema/upgrade-1.2.2-1.2.3-pgsql.sql +++ b/schema/upgrade-1.2.2-1.2.3-pgsql.sql @@ -6,5 +6,7 @@ update ttrss_feeds set include_in_digest = true; alter table ttrss_feeds alter column include_in_digest set not null; alter table ttrss_feeds alter column include_in_digest set default true; +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',3); + update ttrss_version set schema_version = 10; @@ -571,7 +571,7 @@ function catchupCurrentFeed() { str = "Mark all articles in this category as read?"; } */ - if (confirm(str)) { + if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) { return viewCurrentFeed('MarkAllRead') } } |