diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-10 08:07:20 -0800 |
| commit | b42c736607591f8e2bed4aea474ad622b3f7445a (patch) | |
| tree | 83be1069a48cf604a0f73c5d895248c724024fc7 /installer/install.sql | |
| parent | 5e703186fbf0c0cb689fc737de7c074249361ef9 (diff) | |
| parent | 8763e475adc7bb26ed9705c9d61a1db2b20e60c4 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/organize/js/organize.js
Diffstat (limited to 'installer/install.sql')
| -rw-r--r-- | installer/install.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/install.sql b/installer/install.sql index 1f21ad4e..dea324eb 100644 --- a/installer/install.sql +++ b/installer/install.sql @@ -391,7 +391,7 @@ 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','admin_area_timeout','1200'); +INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400'); 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'); |