From ceaaebbc8c99711e143673d845d029a362bc848e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 03:21:48 -0400
Subject: [PATCH] Fix fatal error when date.timezone isn't set (#1488546)
---
program/steps/settings/func.inc | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index da60fea..59bf788e 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -181,7 +181,6 @@
$select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id));
$select_timezone->add(rcube_label('autodetect'), 'auto');
- $now = new DateTime();
foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
try {
$tz = new DateTimeZone($tzs);
@@ -617,6 +616,18 @@
);
}
+ if (!isset($no_override['forward_attachment'])) {
+ $field_id = 'rcmfd_forward_attachment';
+ $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
+ $select->add(rcube_label('inline'), 0);
+ $select->add(rcube_label('asattachment'), 1);
+
+ $blocks['main']['options']['forward_attachment'] = array(
+ 'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
+ 'content' => $select->show(intval($config['forward_attachment'])),
+ );
+ }
+
if (!isset($no_override['default_font'])) {
$field_id = 'rcmfd_default_font';
$fonts = rcube_fontdefs();
--
Gitblit v1.9.1