From a35540c786178027cd93eefdce1e893dd6714631 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 05 Feb 2014 02:38:06 -0500
Subject: [PATCH] Fix issue when default_addressbook option is set to integer value (#1489407)
---
CHANGELOG | 3 ++-
program/steps/addressbook/func.inc | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index cc19da6..020026d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
-- Fixed Opera > 15 detection (#1489562)
+- Fix issue when default_addressbook option is set to integer value (#1489407)
+- Fix Opera > 15 detection (#1489562)
RELEASE 1.0-rc
--------------
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index b33396b..be0dd2a 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -160,7 +160,7 @@
return $CONTACTS;
$OUTPUT->set_env('readonly', $CONTACTS->readonly);
- $OUTPUT->set_env('source', $source);
+ $OUTPUT->set_env('source', (string) $source);
// reduce/extend $CONTACT_COLTYPES with specification from the current $CONTACT object
if (is_array($CONTACTS->coltypes)) {
--
Gitblit v1.9.1