From 540e13b8d50a52e9cb479e36bc6d1e16275a2cd5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 13 Nov 2012 13:44:52 -0500
Subject: [PATCH] Fix warning when 'autovalues' property isn't set
---
program/include/rcube_ldap.php | 3 ++-
program/steps/mail/func.inc | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 90ce73a..7cef255 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -160,7 +160,8 @@
}
// 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 5e24a43..01d95e0 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1110,6 +1110,7 @@
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') {
--
Gitblit v1.9.1