Merge jcrygier's LDAP injection defense and displayname/email retrieval

James Moger

2012-04-25 d2426e1eb5d07664b5c26c4247fae3325282d60d

 src/com/gitblit/models/UserModel.java

@@ -114,6 +114,13 @@
   public String getName() {

      return username;

   }

	
   public String getDisplayName() {

      if (StringUtils.isEmpty(displayName)) {

         return username;

      }

      return displayName;

   }



   @Override

   public String toString() {