Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2012-08-16 7c151376ef97082a785cbcf30e83eea6798662ca

Merge branch 'master' of github.com:roundcube/roundcubemail

 program/include/rcube_ldap.php

@@ -139,6 +139,11 @@
                    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);

 program/include/rcube_message.php

@@ -50,13 +50,13 @@
     */
    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;