summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-13 19:44:52 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-13 19:44:52 +0100
commit540e13b8d50a52e9cb479e36bc6d1e16275a2cd5 (patch)
tree60dbd1b66f8762d6e6a79b0d9957cb323d17204a
parentd9698de979f6d30b5126472edd4af60c43aba870 (diff)
Fix warning when 'autovalues' property isn't set
-rw-r--r--program/include/rcube_ldap.php3
-rw-r--r--program/steps/mail/func.inc1
2 files changed, 3 insertions, 1 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 90ce73ae2..7cef25556 100644
--- a/program/include/rcube_ldap.php
+++ b/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'];
}
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 5e24a4311..01d95e059 100644
--- a/program/steps/mail/func.inc
+++ b/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') {