Bug #239474 --> Fix thunderbird regression preventing LDAP searches from working in the address book.

mail/components/addrbook/content/addressbook.js

@@ -149,6 +149,12 @@ function delayedOnLoadAddressBook()
 
   InitCommonJS();
 
+  //This migrates the LDAPServer Preferences from 4.x to mozilla format.
+  try {
+      gLDAPPrefsService = Components.classes["@mozilla.org/ldapprefs-service;1"].getService();       
+      gLDAPPrefsService = gLDAPPrefsService.QueryInterface( Components.interfaces.nsILDAPPrefsService);                  
+  } catch (ex) {dump ("ERROR: Cannot get the LDAP service\n" + ex + "\n");}
+
   GetCurrentPrefs();
 
   AddPrefObservers();
@@ -635,7 +641,7 @@ function onEnterInSearchBar()
     searchURI += gQueryURIFormat.replace(/@V/g, encodeURIComponent(gSearchInput.value));
   }
 
-  SetAbView(searchURI, sortColumn, sortDirection);
+  SetAbView(searchURI, gSearchInput.value != "", sortColumn, sortDirection);
   
   // XXX todo 
   // this works for synchronous searches of local addressbooks,