summaryrefslogtreecommitdiff
path: root/modules/gallery/config
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/config')
-rw-r--r--modules/gallery/config/locale.php6
-rw-r--r--modules/gallery/config/routes.php4
2 files changed, 9 insertions, 1 deletions
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 4789dc2b..f8241444 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -32,7 +32,11 @@ $config['language'] = array('en_US', 'English_United States');
* Locale timezone. Defaults to use the server timezone.
* @see http://php.net/timezones
*/
-$config['timezone'] = '';
+$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
diff --git a/modules/gallery/config/routes.php b/modules/gallery/config/routes.php
index 63cc6150..8ccd5a01 100644
--- a/modules/gallery/config/routes.php
+++ b/modules/gallery/config/routes.php
@@ -21,6 +21,10 @@
// Admin controllers are not available, except via /admin
$config["^admin_.*"] = null;
+// Redirect /form/add/admin/controller and /form/edit/admin/controller to
+// admin/controller/form_(add|edit)/parms. provides the same as below for admin pages
+$config["^form/(edit|add)/admin/(\w+)/(.*)$"] = "admin/$2/form_$1/$3";
+
// Redirect /form/add and /form/edit to the module/form_(add|edit)/parms.
$config["^form/(edit|add)/(\w+)/(.*)$"] = "$2/form_$1/$3";