stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-28 16:39:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Oops, fix up a bug originally added in

Browse Source 
7d66ab2e94 when I tweaked the name of
the rss_available variable to be rss_visible, but got it wrong.  Bump
the comment module to 6 so that we run the installer and clean up old
vars.

Fixes #1854.
This commit is contained in:
Bharat Mediratta
2012-05-07 13:45:13 -07:00
parent 6effd5f75e
commit 5400c4be26
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer/install.sql
View File

@@ -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',5,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);
@@ -419,7 +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_available','both');
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');

4
modules/comment/controllers/admin_comments.php
View File

@@ -32,8 +32,8 @@ class Admin_Comments_Controller extends Admin_Controller {
$form->validate();
module::set_var("comment", "access_permissions",
$form->comment_settings->access_permissions->value);
module::set_var("comment", "rss_available",
$form->comment_settings->rss_available->value);
module::set_var("comment", "rss_visible",
$form->comment_settings->rss_visible->value);
message::success(t("Comment settings updated"));
url::redirect("admin/comments");
}

14
modules/comment/helpers/comment_installer.php
View File

@@ -48,8 +48,8 @@ class comment_installer {
module::set_var("comment", "spam_caught", 0);
module::set_var("comment", "access_permissions", "everybody");
module::set_var("comment", "rss_available", "both");
module::set_version("comment", 5);
module::set_var("comment", "rss_visible", "both");
module::set_version("comment", 6);
}
static function upgrade($version) {
@@ -81,6 +81,16 @@ class comment_installer {
module::set_var("comment", "rss_visible", "all");
module::set_version("comment", $version = 5);
}
// In version 5 we accidentally set the installer variable to rss_available when it should
// have been rss_visible. Migrate it over now, if necessary.
if ($version == 5) {
if (!module::get_var("comment", "rss_visible")) {
module::set_var("comment", "rss_visible", module::get_var("comment", "rss_available"));
}
module::clear_var("comment", "rss_available");
module::set_version("comment", $version = 6);
}
}
static function uninstall() {

2
modules/comment/module.info
View File

@@ -1,6 +1,6 @@
name = "Comments"
description = "Allows users and guests to leave comments on photos and albums."
version = 5
version = 6
author_name = "Gallery Team"
author_url = "http://codex.gallery2.org/Gallery:Team"
info_url = "http://codex.gallery2.org/Gallery3:Modules:comment"