Merge branch 'hotfix'

This commit is contained in:
Nabin Hait 2017-02-16 15:59:16 +05:30
commit 3b8a8c4983
2 changed files with 2 additions and 2 deletions

View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '7.2.16'
__version__ = '7.2.17'
__title__ = "Frappe Framework"
local = Local()

View file

@ -334,7 +334,7 @@ $.extend(frappe, {
// Utility functions
function valid_email(id) {
return /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.test(id.toLowerCase());
return (id.toLowerCase().search("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")==-1) ? 0 : 1;
}
var validate_email = valid_email;