Browse Source

Fix warning when 'autovalues' property isn't set

pull/45/merge
Aleksander Machniak 13 years ago
parent
commit
540e13b8d5
  1. 3
      program/include/rcube_ldap.php
  2. 1
      program/steps/mail/func.inc

3
program/include/rcube_ldap.php

@ -160,7 +160,8 @@ class rcube_ldap extends rcube_addressbook
}
// make sure LDAP_rdn field is required
if (!empty($this->prop['LDAP_rdn']) && !in_array($this->prop['LDAP_rdn'], $this->prop['required_fields']) && !in_array($this->prop['LDAP_rdn'], array_keys($this->prop['autovalues']))) {
if (!empty($this->prop['LDAP_rdn']) && !in_array($this->prop['LDAP_rdn'], $this->prop['required_fields'])
&& !in_array($this->prop['LDAP_rdn'], array_keys((array)$this->prop['autovalues']))) {
$this->prop['required_fields'][] = $this->prop['LDAP_rdn'];
}

1
program/steps/mail/func.inc

@ -1110,6 +1110,7 @@ function rcmail_message_body($attrib)
if (!empty($MESSAGE->parts)) {
foreach ($MESSAGE->parts as $i => $part) {
console($part);
if ($part->type == 'headers')
$out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
else if ($part->type == 'content') {

Loading…
Cancel
Save