Merge branch 'release' into development

This commit is contained in:
Francois Gaillard
2013-03-07 18:17:13 +01:00
5 changed files with 830 additions and 760 deletions
+1 -1
View File
@@ -60,7 +60,7 @@ class EditorialClass extends ObjectModel
// Lang fields
'body_title' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
'body_subheading' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
'body_paragraph' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'),
'body_paragraph' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isString'),
'body_logo_subheading' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName'),
)
);