diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-29 16:47:16 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-29 16:47:16 -0700 |
| commit | 6f1da3aba426329eef312831365de29f89529d9f (patch) | |
| tree | 19885be32269a7e3291e11228c1e1531aed55bc1 | |
| parent | 653c291d94f02e3e292541fe39d9fc95bf3d22ba (diff) | |
| parent | 9d2420e789cd02d459e7b1504b995bd9f4e84d00 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rwxr-xr-x | installer/install.sql | 7 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/installer/install.sql b/installer/install.sql index 0f8a2410..48b504ba 100755 --- a/installer/install.sql +++ b/installer/install.sql @@ -169,7 +169,8 @@ CREATE TABLE {items} ( PRIMARY KEY (`id`), KEY `parent_id` (`parent_id`), KEY `type` (`type`), - KEY `random` (`rand_key`) + KEY `random` (`rand_key`), + KEY `weight` (`weight`) ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,NULL,0,NULL,'',1,NULL,NULL,2,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1'); @@ -225,7 +226,7 @@ CREATE TABLE {modules} ( UNIQUE KEY `name` (`name`) ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; -INSERT INTO {modules} VALUES (1,1,'gallery',9); +INSERT INTO {modules} VALUES (1,1,'gallery',10); INSERT INTO {modules} VALUES (2,1,'user',1); INSERT INTO {modules} VALUES (3,1,'comment',2); INSERT INTO {modules} VALUES (4,1,'organize',1); @@ -277,7 +278,7 @@ CREATE TABLE {search_records} ( FULLTEXT KEY `data` (`data`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; SET character_set_client = @saved_cs_client; -INSERT INTO {search_records} VALUES (1,1,0,' Gallery'); +INSERT INTO {search_records} VALUES (1,1,0,' Gallery'); DROP TABLE IF EXISTS {sessions}; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 2322110e..fd2cd7f9 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -269,7 +269,7 @@ class gallery_installer { 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", 9); + module::set_version("gallery", 10); } static function upgrade($version) { |