stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-26 09:43:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-generate the install.sql so that the keys of the block lists are an md5 hash of the module_name:block_id. Also change the packager so we delete the _cache variable for the module gallery not core.

Browse Source
This commit is contained in:
Tim Almdal
2009-11-12 13:14:02 -08:00
parent 79f700ef9f
commit a5a8cfd1bc
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/install.sql
+5 -5
View File
@@ -366,7 +366,7 @@ CREATE TABLE {vars} (
`value` text,
PRIMARY KEY (`id`),
UNIQUE KEY `module_name` (`module_name`,`name`)
) AUTO_INCREMENT=35 DEFAULT CHARSET=utf8;
) AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
SET character_set_client = @saved_cs_client;
INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','wind');
INSERT INTO {vars} VALUES (2,'gallery','active_admin_theme','admin_wind');
@@ -376,15 +376,15 @@ INSERT INTO {vars} VALUES (5,'gallery','resize_size','640');
INSERT INTO {vars} VALUES (6,'gallery','default_locale','en_US');
INSERT INTO {vars} VALUES (7,'gallery','image_quality','75');
INSERT INTO {vars} VALUES (8,'gallery','image_sharpen','15');
INSERT INTO {vars} VALUES (10,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
INSERT INTO {vars} VALUES (10,'gallery','blocks_dashboard_sidebar','a:4:{s:32:\"ea6daed3baa18234bb574af71ab42250\";a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}s:32:\"f566a858e4b0238c0429d7b03b9f136f\";a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}s:32:\"4a3e6ed692f52ff14fbc0bfb94a1a130\";a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}s:32:\"53c72b14ba93d7f23d0efb72cc4d7cd1\";a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
INSERT INTO {vars} VALUES (22,'gallery','show_credits','1');
INSERT INTO {vars} VALUES (23,'gallery','credits','Powered by <a href=\"%url\">Gallery %version</a>');
INSERT INTO {vars} VALUES (20,'gallery','date_time_format','Y-M-d H:i:s');
INSERT INTO {vars} VALUES (21,'gallery','time_format','H:i:s');
INSERT INTO {vars} VALUES (15,'gallery','blocks_dashboard_center','a:4:{i:6;a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}i:7;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}i:8;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}i:9;a:2:{i:0;s:7:\"comment\";i:1;s:15:\"recent_comments\";}}');
INSERT INTO {vars} VALUES (15,'gallery','blocks_dashboard_center','a:3:{s:32:\"0fb54e06307c0ec68ff9494082191235\";a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}s:32:\"f76ac022796947436740be2144b6d776\";a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}s:32:\"42a3ca45d2397f2d3e59dacae4caf3e0\";a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}}');
INSERT INTO {vars} VALUES (18,'gallery','choose_default_tookit','1');
INSERT INTO {vars} VALUES (19,'gallery','date_format','Y-M-d');
INSERT INTO {vars} VALUES (26,'user','mininum_password_length','5');
INSERT INTO {vars} VALUES (27,'comment','spam_caught','0');
INSERT INTO {vars} VALUES (25,'gallery','identity_provider','user');
INSERT INTO {vars} VALUES (28,'comment','spam_caught','0');
INSERT INTO {vars} VALUES (30,'gallery','blocks_site.sidebar','a:3:{s:32:\"6e901fd82a43b0e07ebbd7123b5ee349\";a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}s:32:\"c07f62cf746316b111a61681fe49ad39\";a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}s:32:\"2eef3fd349091e4e1cee9e27072bff39\";a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
INSERT INTO {vars} VALUES (29,'gallery','blocks_site.sidebar','a:3:{s:32:\"6e901fd82a43b0e07ebbd7123b5ee349\";a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}s:32:\"c07f62cf746316b111a61681fe49ad39\";a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}s:32:\"2eef3fd349091e4e1cee9e27072bff39\";a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
modules/comment/helpers/comment_installer.php
-1
View File
@@ -46,7 +46,6 @@ class comment_installer {
PRIMARY KEY (`id`))
DEFAULT CHARSET=utf8;");
block_manager::add("dashboard_center", "comment", "recent_comments");
module::set_var("comment", "spam_caught", 0);
module::set_version("comment", 2);
}
modules/gallery/controllers/admin_sidebar.php
+1 -1
View File
@@ -35,7 +35,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
$active_blocks = array();
foreach ($this->input->get("block", array()) as $block_id) {
$active_blocks[] = explode(":", (string) $block_id);
$active_blocks[md5($block_id)] = explode(":", (string) $block_id);
}
block_manager::set_active("site.sidebar", $active_blocks);
modules/gallery/controllers/packager.php
+2 -12
View File
@@ -62,6 +62,7 @@ class Packager_Controller extends Controller {
srand(0);
gallery_installer::install(true);
module::load_modules();
foreach (array("user", "comment", "organize", "info", "rss",
@@ -72,21 +73,10 @@ class Packager_Controller extends Controller {
}
private function _dump_database() {
// We now have a clean install with just the packages that we want. Make sure that the
// database is clean too.
$i = 1;
foreach (array("blocks_dashboard_sidebar", "blocks_dashboard_center") as $key) {
$blocks = array();
foreach (unserialize(module::get_var("gallery", $key)) as $rnd => $value) {
$blocks[++$i] = $value;
}
module::set_var("gallery", $key, serialize($blocks));
}
$db = Database::instance();
$db->query("TRUNCATE {sessions}");
$db->query("TRUNCATE {logs}");
$db->query("DELETE FROM {vars} WHERE `module_name` = 'core' AND `name` = '_cache'");
$db->query("DELETE FROM {vars} WHERE `module_name` = 'gallery' AND `name` = '_cache'");
$db->update("users", array("password" => ""), array("id" => 1));
$db->update("users", array("password" => ""), array("id" => 2));