Use updated, more lenient email matching

projectblacklight · Sep 15, 2016 · d27bf85 · d27bf85
1 parent 77dd08e
commit d27bf85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/controllers/concerns/blacklight/catalog.rb b/app/controllers/concerns/blacklight/catalog.rb
@@ -224,7 +224,7 @@ def sms_mappings
     def validate_email_params
       if params[:to].blank?
         flash[:error] = I18n.t('blacklight.email.errors.to.blank')
-      elsif !params[:to].match(defined?(Devise) ? Devise.email_regexp : /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)
+      elsif !params[:to].match(Blacklight::Engine.config.email_regexp)
         flash[:error] = I18n.t('blacklight.email.errors.to.invalid', :to => params[:to])
       end
 

diff --git a/lib/blacklight/engine.rb b/lib/blacklight/engine.rb
@@ -43,5 +43,7 @@ class Engine < Rails::Engine
     }
 
     config.bookmarks_http_method = :post
+
+    config.email_regexp = defined?(Devise) ? Devise.email_regexp : /\A[^@\s]+@[^@\s]+\z/
   end
 end