diff --git a/CHANGELOG b/CHANGELOG index 6a2811cf29..6b5d1b7c32 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Remove img_{width,height} form attributes + Version 3.4.0 - 2014-10-20 * Bug fixes (see mercurial logs for details) * Use literal_eval instead of safe_eval (CVE-2014-6633) diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc index 5943d85932..dc953606e1 100644 --- a/trytond/ir/ui/form.rnc +++ b/trytond/ir/ui/form.rnc @@ -99,8 +99,6 @@ attlist.field &= }? attlist.field &= attribute spell { text }? attlist.field &= attribute float_time { text }? -attlist.field &= attribute img_width { text }? -attlist.field &= attribute img_height { text }? attlist.field &= [a:defaultValue = "0"] attribute filename_visible { "0" | "1" }? attlist.field &= [a:defaultValue = "0"] attribute pre_validate { "0" | "1" }? diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng index 87b446cac2..171569b268 100644 --- a/trytond/ir/ui/form.rng +++ b/trytond/ir/ui/form.rng @@ -332,16 +332,6 @@ - - - - - - - - - -