Merge branch 'develop' of github.com:martini/zammad into develop

2016-02-17 18:12:43 +01:00 · 2016-02-17 18:12:43 +01:00 · 9e40e36bd8
commit 9e40e36bd8
parent 0f21655439 58396da9ae
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -393,7 +393,7 @@ class ApplicationController < ActionController::Base
    data = {
      error: error
    }
-    if error =~ /(already exists|duplicate key)/i
+    if error =~ /(already exists|duplicate key|duplicate entry)/i
      data[:error_human] = 'Object already exists!'
    end
    data