From 7653ed107e008f917fdfc0530f2409644c7e982b Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 24 Oct 2014 08:24:16 +0200 Subject: Fix compatibility with PHP 5.2. in rcube_imap_generic (#1490115) --- CHANGELOG | 1 + program/lib/Roundcube/rcube_imap_generic.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d08f25201..87dfc89a7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix compatibility with PHP 5.2. in rcube_imap_generic (#1490115) - Fix setting flags on servers with no PERMANENTFLAGS response (#1490087) - Fix regression in SHAA password generation in ldap driver of password plugin (#1490094) - Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103) diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index d032f420d..494185913 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -865,7 +865,7 @@ class rcube_imap_generic if (!$this->fp) { $this->setError(self::ERROR_BAD, sprintf("Could not connect to %s:%d: %s", - $host, $this->prefs['port'], $errstr ?: "Unknown reason")); + $host, $this->prefs['port'], $errstr ? $errstr : "Unknown reason")); return false; } -- cgit v1.2.3