Another fix for JM-1240.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@9743 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_4_4/src/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java

@@ -247,6 +247,10 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener {
             // No vcard passed in?  Hrm.  Fine, return LDAP vcard.
             return vcard;
         }
+        if (mergeVCard.element("PHOTO") == null) {
+            // Merged vcard has no photo element, return LDAP vcard as is.
+            return vcard;
+        }
         Element photoElement = mergeVCard.element("PHOTO").createCopy();
         if (photoElement == null || photoElement.element("BINVAL") == null || photoElement.element("BINVAL").getText().matches("\\s*")) {
             // We were passed something null or empty, so lets just return the LDAP based vcard.