summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-02-05 08:38:06 +0100
committerAleksander Machniak <alec@alec.pl>2014-02-05 08:38:44 +0100
commitaf15c60f88f5c0f48fd577c21fd110467eb426ab (patch)
treee0a7c657dae44f27a92433987a8ff034e60de59a
parentf8a57ebd94941b685287895519fa7427f8e30b3b (diff)
Fix issue when default_addressbook option is set to integer value (#1489407)
-rw-r--r--CHANGELOG3
-rw-r--r--program/steps/addressbook/func.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index cc19da6f0..020026d3f 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 b33396baf..be0dd2a33 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -160,7 +160,7 @@ function rcmail_contact_source($source=null, $init_env=false, $writable=false)
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)) {