diff --git a/VERSION b/VERSION index 54015bbe..9bd505af 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.11.24.20.32.35 +Version 2.7.4-stable+timestamp.2013.11.25.15.21.21 diff --git a/gluon/html.py b/gluon/html.py index feac9423..d78a19d2 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -2221,8 +2221,9 @@ class FORM(DIV): submit = self.element('input[type=submit]') submit.parent.append( INPUT(_type="button", _value=value, _class=_class, - _onclick=self.REDIRECT_JS % url)) - + _onclick=url if url.startswith('javascript:') else + self.REDIRECT_JS % url)) + @staticmethod def confirm(text='OK', buttons=None, hidden=None): if not buttons: