Permalink
Browse files

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

  • Loading branch information...
2 parents 62693db + c603a44 commit 8ed47ceaad15bc7ef7ee292f167c8dddf57593f2 @bharat bharat committed Dec 7, 2009
View
@@ -228,7 +228,7 @@ CREATE TABLE {modules} (
UNIQUE KEY `name` (`name`)
) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',19);
+INSERT INTO {modules} VALUES (1,1,'gallery',21);
INSERT INTO {modules} VALUES (2,1,'user',2);
INSERT INTO {modules} VALUES (3,1,'comment',2);
INSERT INTO {modules} VALUES (4,1,'organize',1);
@@ -366,25 +366,26 @@ CREATE TABLE {vars} (
`value` text,
PRIMARY KEY (`id`),
UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=35 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=36 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');
-INSERT INTO {vars} VALUES (3,'gallery','page_size','9');
-INSERT INTO {vars} VALUES (4,'gallery','thumb_size','200');
-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 (21,'gallery','time_format','H:i:s');
-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 (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 (20,'gallery','date_time_format','Y-M-d H:i:s');
-INSERT INTO {vars} VALUES (19,'gallery','date_format','Y-M-d');
-INSERT INTO {vars} VALUES (15,'gallery','blocks_dashboard_center','a:3:{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\";}}');
-INSERT INTO {vars} VALUES (18,'gallery','choose_default_tookit','1');
-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 (29,'gallery','blocks_site_sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
+INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
+INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
+INSERT INTO {vars} VALUES (NULL,'gallery','page_size','9');
+INSERT INTO {vars} VALUES (NULL,'gallery','thumb_size','200');
+INSERT INTO {vars} VALUES (NULL,'gallery','resize_size','640');
+INSERT INTO {vars} VALUES (NULL,'gallery','default_locale','en_US');
+INSERT INTO {vars} VALUES (NULL,'gallery','image_quality','75');
+INSERT INTO {vars} VALUES (NULL,'gallery','image_sharpen','15');
+INSERT INTO {vars} VALUES (NULL,'gallery','time_format','H:i:s');
+INSERT INTO {vars} VALUES (NULL,'gallery','show_credits','1');
+INSERT INTO {vars} VALUES (NULL,'gallery','credits','Powered by <a href=\"%url\">Gallery %version</a>');
+INSERT INTO {vars} VALUES (NULL,'gallery','simultaneous_upload_limit','5');
+INSERT INTO {vars} VALUES (NULL,'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 (NULL,'gallery','date_time_format','Y-M-d H:i:s');
+INSERT INTO {vars} VALUES (NULL,'gallery','date_format','Y-M-d');
+INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_center','a:3:{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\";}}');
+INSERT INTO {vars} VALUES (NULL,'gallery','choose_default_tookit','1');
+INSERT INTO {vars} VALUES (NULL,'user','mininum_password_length','5');
+INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
+INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
+INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
@@ -145,6 +145,10 @@ input[type="reset"] {
display: none;
}
+input[readonly] {
+ background-color: #F4F4FC;
+}
+
#g-dialog input.textbox,
#g-dialog input[type=text],
#g-dialog input[type=password],
@@ -134,6 +134,11 @@ private function _dump_database() {
$line = preg_replace("/ENGINE=\S+ /", "", $line);
}
+ // Null out ids in the vars table since it's an auto_increment table and this will result in
+ // more stable values so we'll have less churn in install.sql.
+ $line = preg_replace(
+ "/^INSERT INTO {vars} VALUES \(\d+/", "INSERT INTO {vars} VALUES (NULL", $line);
+
$buf .= $line;
}
$fd = fopen($sql_file, "wb");
@@ -37,7 +37,7 @@ static function activate_blocks($module_name) {
$block_class = "{$module_name}_block";
if (method_exists($block_class, "get_site_list")) {
$blocks = call_user_func(array($block_class, "get_site_list"));
- foreach (array_keys($blocks) as $block_id) {
+ foreach (array_keys($blocks) as $block_id) {
self::add("site_sidebar", $module_name, $block_id);
}
}
@@ -268,7 +268,8 @@ static function install() {
module::set_var("gallery", "show_credits", 1);
// @todo this string needs to be picked up by l10n_scanner
module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
- module::set_version("gallery", 19);
+ module::set_var("gallery", "simultaneous_upload_limit", 5);
+ module::set_version("gallery", 21);
}
static function upgrade($version) {

0 comments on commit 8ed47ce

Please sign in to comment.