Fix issue when default_addressbook option is set to integer value (#1489407)

11 years ago · af15c60f88
parent f8a57ebd94
commit af15c60f88
2 changed files with 3 additions and 2 deletions
--- a/3
+++ b/3
@ -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
 --------------
--- 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)) {