diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-01-06 08:12:54 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-01-06 08:12:54 -0800 |
| commit | 56c4997663cfc93174bd0b450768b0bffffb5169 (patch) | |
| tree | b1f5d942d120773201aaf5356f46109cc5235d30 | |
| parent | 9e6e2138dfd507dbd0ce8835072b7d950855b3d4 (diff) | |
| parent | 84f73fbe9e1b7127fb342dc164b066f51b7fa67d (diff) | |
Merge branch 'organize_dev' of github.com:gallery/gallery3 into organize_dev
| -rw-r--r-- | installer/install.sql | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 4 | ||||
| -rw-r--r-- | modules/gallery/module.info | 2 | ||||
| -rw-r--r-- | modules/organize/css/organize.css | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/installer/install.sql b/installer/install.sql index 84a975ae..6aae8014 100644 --- a/installer/install.sql +++ b/installer/install.sql @@ -43,7 +43,7 @@ CREATE TABLE {caches} ( `expiration` int(9) NOT NULL, `cache` longblob, PRIMARY KEY (`id`), - KEY `key` (`key`), + UNIQUE KEY `key` (`key`), KEY `tags` (`tags`) ) DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; @@ -152,7 +152,7 @@ CREATE TABLE {items} ( `album_cover_item_id` int(9) DEFAULT NULL, `captured` int(9) DEFAULT NULL, `created` int(9) DEFAULT NULL, - `description` varchar(2048) DEFAULT NULL, + `description` text, `height` int(9) DEFAULT NULL, `left_ptr` int(9) NOT NULL, `level` int(9) NOT NULL, diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 834a27fa..f7b8da5f 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -44,7 +44,7 @@ class gallery_installer { `expiration` int(9) NOT NULL, `cache` longblob, PRIMARY KEY (`id`), - KEY (`key`), + UNIQUE KEY (`key`), KEY (`tags`)) DEFAULT CHARSET=utf8;"); @@ -84,7 +84,7 @@ class gallery_installer { `album_cover_item_id` int(9) default NULL, `captured` int(9) default NULL, `created` int(9) default NULL, - `description` varchar(2048) default NULL, + `description` text default NULL, `height` int(9) default NULL, `left_ptr` int(9) NOT NULL, `level` int(9) NOT NULL, diff --git a/modules/gallery/module.info b/modules/gallery/module.info index 0cc3f6d1..eb579ab6 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,3 +1,3 @@ name = "Gallery 3" description = "Gallery core application" -version = 42 +version = 43 diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index d5d8c597..87ee8efa 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -8,6 +8,7 @@ width: 144px; height: 149px; vertical-align: middle; + text-align: center; float: left; } |