From bc94e296e74ab4a3313a3f807b0a5cc40f264879 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 08 Aug 2013 07:37:46 -0400
Subject: [PATCH] Correct imap_timeout and smtp_timeout description, so 0 doesn't mean no limit, but default_socket_timeout use (#1489247)
---
program/steps/utils/error.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
index 126cf2e..9fb71c5 100644
--- a/program/steps/utils/error.inc
+++ b/program/steps/utils/error.inc
@@ -5,7 +5,7 @@
| program/steps/utils/error.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2011, The Roundcube Dev Team |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -23,11 +23,11 @@
// browser is not compatible with this application
if ($ERROR_CODE==409) {
- $user_agent = $GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
+ $user_agent = htmlentities($_SERVER['HTTP_USER_AGENT']);
$__error_title = 'Your browser does not suit the requirements for this application';
$__error_text = <<<EOF
<i>Supported browsers:</i><br />
-» Microsoft Internet Explorer 6+<br />
+» Microsoft Internet Explorer 7+<br />
» Mozilla Firefox 3+<br />
» Chrome 10+<br />
» Safari 4+<br />
--
Gitblit v1.9.1