diff options
| -rw-r--r-- | feedlist.js | 4 | ||||
| -rw-r--r-- | functions.php | 5 | ||||
| -rw-r--r-- | sanity_check.php | 2 | ||||
| -rw-r--r-- | schema/ttrss_schema_mysql.sql | 4 | ||||
| -rw-r--r-- | schema/ttrss_schema_pgsql.sql | 4 | ||||
| -rw-r--r-- | schema/versions/mysql/33.sql | 3 | ||||
| -rw-r--r-- | schema/versions/pgsql/33.sql | 3 |
7 files changed, 17 insertions, 8 deletions
diff --git a/feedlist.js b/feedlist.js index fdfe4d86f..7a373b718 100644 --- a/feedlist.js +++ b/feedlist.js @@ -40,7 +40,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) { cache_invalidate("F:" + feed); } - if (getInitParam("theme") == "" && getInitParam("hide_feedlist")) { + if (getInitParam("theme") == "" && getInitParam("hide_feedlist") == 1) { Element.hide("feeds-holder"); // Effect.Fade('feeds-holder', {duration : 0.2, // queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }}); @@ -346,7 +346,7 @@ function feedlist_init() { if (getInitParam("theme") == "") { setTimeout("hide_footer()", 5000); - if (getInitParam("hide_feedlist")) { + if (getInitParam("hide_feedlist") == 1) { init_hidden_feedlist(); } } diff --git a/functions.php b/functions.php index d4f853a54..05ba701af 100644 --- a/functions.php +++ b/functions.php @@ -2925,9 +2925,8 @@ print "<param key=\"hide_read_shows_special\" value=\"" . (int) get_pref($link, "HIDE_READ_SHOWS_SPECIAL") . "\"/>"; - if (defined('_HIDDEN_FL_TEST')) { - print "<param key=\"hide_feedlist\" value=\"1\"/>"; - } + print "<param key=\"hide_feedlist\" value=\"" . + (int) get_pref($link, "HIDE_FEEDLIST") . "\"/>"; print "</init-params>"; } diff --git a/sanity_check.php b/sanity_check.php index 2a7c07a15..47d12f98d 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 15); - define('SCHEMA_VERSION', 32); + define('SCHEMA_VERSION', 33); if (!file_exists("config.php")) { print __("<b>Fatal Error</b>: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 04f740281..db72c74be 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -205,7 +205,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (32); +insert into ttrss_version values (33); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -323,6 +323,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) values('HIDE_READ_SHOWS_SPECIAL', 1, 'true', 'Show special feeds when hiding read feeds',3); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.'); + 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 228ce526f..92aa72b72 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -184,7 +184,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (32); +insert into ttrss_version values (33); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -296,6 +296,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) values('HIDE_READ_SHOWS_SPECIAL', 1, 'true', 'Show special feeds when hiding read feeds',3); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.'); + 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/versions/mysql/33.sql b/schema/versions/mysql/33.sql new file mode 100644 index 000000000..8317dc2de --- /dev/null +++ b/schema/versions/mysql/33.sql @@ -0,0 +1,3 @@ +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.'); + +update ttrss_version set schema_version = 33; diff --git a/schema/versions/pgsql/33.sql b/schema/versions/pgsql/33.sql new file mode 100644 index 000000000..8317dc2de --- /dev/null +++ b/schema/versions/pgsql/33.sql @@ -0,0 +1,3 @@ +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.'); + +update ttrss_version set schema_version = 33; |