* added an additional check so not everyone "attempts" ldap search if this is not configured (compose.patch did not contain this)

git-svn-id: https://svn.roundcube.net/trunk@988 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 9 insertions, 9 deletions

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index c3063e373..89fc9e9bc 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -878,12 +878,13 @@ $CONTACTS->set_pagesize(1000);
 $a_contacts = array(); 
                                    
 if ($result = $CONTACTS->list_records())
-{
+  {
   while ($sql_arr = $result->iterate())
     if ($sql_arr['email'])
       $a_contacts[] = format_email_recipient($sql_arr['email'], JQ($sql_arr['name']));
-}
-
+  }
+if (isset($CONFIG['ldap_public'])) {
+  {
 /* LDAP autocompletion */ 
 foreach ($CONFIG['ldap_public'] as $ldapserv_config) 
   { 
@@ -910,12 +911,11 @@ foreach ($CONFIG['ldap_public'] as $ldapserv_config)
  	} 
  		 
   $LDAP->close(); 
-  } 
-	                                    
-  if ($a_contacts) 
- 	{ 
+  }
+  }
+if ($a_contacts) 
+  { 
  	$OUTPUT->set_env('contacts', $a_contacts); 
- 	} 
-
+  } 
 parse_template('compose');
 ?>
\ No newline at end of file