summaryrefslogtreecommitdiff
path: root/modules/gallery/config
diff options
context:
space:
mode:
authorAndy Staudacher <andy.st@gmail.com>2010-02-02 13:41:50 -0800
committerAndy Staudacher <andy.st@gmail.com>2010-02-02 13:41:50 -0800
commit31aaf7555f51dd80cf1e97fd3c20a1c245cbf61b (patch)
tree594ca1cebbe5b8b58b4c50cb3c88487574dba712 /modules/gallery/config
parentbe5f38adea89bdb95be359aea3d97615b6b530a3 (diff)
parent3c3671cff25f28e21a702b1f665a6baa282d045f (diff)
Merge commit 'upstream/master'
Diffstat (limited to 'modules/gallery/config')
-rw-r--r--modules/gallery/config/locale.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 2d401758..f8241444 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -33,6 +33,10 @@ $config['language'] = array('en_US', 'English_United States');
* @see http://php.net/timezones
*/
$config['timezone'] = ini_get('date.timezone');
+if (empty($config['timezone'])) {
+ // This is a required field. Pick something as a default.
+ $config['timezone'] = "America/Los_Angeles";
+}
// i18n settings