summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-16 19:45:01 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-16 19:45:01 +0200
commit7c151376ef97082a785cbcf30e83eea6798662ca (patch)
treead22fdf38999bed3b672473369ccaab3100a14c1 /program
parente824925290a0fdf3852f4562dc459a4cbd4e5768 (diff)
parentfb001f851f60e99b4ba9d2f837a76a46dfd3fd5f (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_ldap.php5
-rw-r--r--program/include/rcube_message.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index dbab0fd06..ad2ccddeb 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -139,6 +139,11 @@ class rcube_ldap extends rcube_addressbook
unset($this->coltypes[$childcol]); // remove address child col from global coltypes list
}
}
+
+ // at least one address type must be specified
+ if (empty($this->coltypes['address']['subtypes'])) {
+ $this->coltypes['address']['subtypes'] = array('home');
+ }
}
else if ($this->coltypes['address']) {
$this->coltypes['address'] += array('type' => 'textarea', 'childs' => null, 'size' => 40);
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 9d36acf38..f550b574e 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -50,13 +50,13 @@ class rcube_message
*/
private $mime;
private $opt = array();
- private $inline_parts = array();
private $parse_alternative = false;
public $uid = null;
public $headers;
public $parts = array();
public $mime_parts = array();
+ public $inline_parts = array();
public $attachments = array();
public $subject = '';
public $sender = null;