From e07f89815b88139a5b0945bd89277eb6b36e8f5a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 15 Aug 2012 09:11:43 +0400
Subject: [PATCH] properly persist include_children

---
 classes/feeds.php             | 3 +--
 include/functions.php         | 4 ++--
 schema/ttrss_schema_mysql.sql | 4 +++-
 schema/ttrss_schema_pgsql.sql | 4 +++-
 schema/versions/mysql/94.sql  | 7 +++++++
 schema/versions/pgsql/94.sql  | 7 +++++++
 6 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 schema/versions/mysql/94.sql
 create mode 100644 schema/versions/pgsql/94.sql

diff --git a/classes/feeds.php b/classes/feeds.php
index be7886472..a3062565a 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -805,8 +805,7 @@ class Feeds extends Protected_Handler {
 		set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);
 		set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);
 		set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
-
-		$_SESSION["_DEFAULT_INCLUDE_CHILDREN"] = $include_children;
+		set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);
 
 		if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
 			db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
diff --git a/include/functions.php b/include/functions.php
index ac9c5372c..91f3b900e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 25);
-	define('SCHEMA_VERSION', 93);
+	define('SCHEMA_VERSION', 94);
 
 	mb_internal_encoding("UTF-8");
 	date_default_timezone_set('UTC');
@@ -2152,7 +2152,7 @@
 
 		$params["icons_url"] = ICONS_URL;
 		$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
-		$params["default_include_children"] = $_SESSION["_DEFAULT_INCLUDE_CHILDREN"];
+		$params["default_include_children"] = get_pref($link, "_DEFAULT_INCLUDE_CHILDREN");
 		$params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
 		$params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
 		$params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 3f63d44ee..4a2726822 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -270,7 +270,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (93);
+insert into ttrss_version values (94);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -408,6 +408,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', '', 1);
+
 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 d5d3f88f0..208005cf6 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -232,7 +232,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (93);
+insert into ttrss_version values (94);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -363,6 +363,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', '', 1);
+
 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/94.sql b/schema/versions/mysql/94.sql
new file mode 100644
index 000000000..0f76c4c5f
--- /dev/null
+++ b/schema/versions/mysql/94.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', '', 1);
+
+update ttrss_version set schema_version = 94;
+
+commit;
diff --git a/schema/versions/pgsql/94.sql b/schema/versions/pgsql/94.sql
new file mode 100644
index 000000000..0f76c4c5f
--- /dev/null
+++ b/schema/versions/pgsql/94.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', '', 1);
+
+update ttrss_version set schema_version = 94;
+
+commit;