Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 3 insertions, 2 deletions

diff --git a/installer/install.sql b/installer/install.sql
index 2b8ec11e..2ba168d2 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -246,7 +246,7 @@ CREATE TABLE {modules} (
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {modules} VALUES (1,1,'gallery',49,1);
 INSERT INTO {modules} VALUES (2,1,'user',4,2);
-INSERT INTO {modules} VALUES (3,1,'comment',4,3);
+INSERT INTO {modules} VALUES (3,1,'comment',6,3);
 INSERT INTO {modules} VALUES (4,1,'organize',4,4);
 INSERT INTO {modules} VALUES (5,1,'info',2,5);
 INSERT INTO {modules} VALUES (6,1,'rss',1,6);
@@ -382,7 +382,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -419,6 +419,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
 INSERT INTO {vars} VALUES (NULL,'user','minimum_password_length','5');
 INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
+INSERT INTO {vars} VALUES (NULL,'comment','rss_visible','both');
 INSERT INTO {vars} VALUES (NULL,'info','show_title','1');
 INSERT INTO {vars} VALUES (NULL,'info','show_description','1');
 INSERT INTO {vars} VALUES (NULL,'info','show_owner','1');