TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into modules

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
This commit is contained in:
Etienne Roudeix
2013-11-28 10:34:57 +01:00
parent 4c754376e7 7e83896f96
commit 247ed6aa2a
66 changed files with 3543 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
local/config/schema.xml
View File

@@ -29,6 +29,9 @@
<column name="description" type="CLOB" />
<column name="chapo" type="LONGVARCHAR" />
<column name="postscriptum" type="LONGVARCHAR" />
<column name="template_id" type="INTEGER" />
<column name="meta_title" size="255" type="VARCHAR" />
<column name="meta_description" type="LONGVARCHAR" />
<column name="meta_keyword" type="LONGVARCHAR" />
<foreign-key foreignTable="tax_rule" name="fk_product_tax_rule_id" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference foreign="id" local="tax_rule_id" />
@@ -46,7 +49,7 @@
<index-column name="template_id" />
</index>
<behavior name="timestampable" />
<behavior name="i18n">
<behavior name="i18n">
<parameter name="i18n_columns" value="title, description, chapo, postscriptum, meta_title, meta_description, meta_keyword" />
</behavior>
<behavior name="versionable">
@@ -820,6 +823,10 @@
<column name="title" type="LONGVARCHAR" />
<column name="subject" type="LONGVARCHAR" />
<column name="text_message" type="CLOB" />
<column name="html_message" type="CLOB" />
<column name="text_layout_file_name" size="255" type="VARCHAR" />
<column name="text_template_file_name" size="255" type="VARCHAR" />
<column name="html_layout_file_name" size="255" type="VARCHAR" />
<column name="html_template_file_name" size="255" type="VARCHAR" />
<unique name="name_UNIQUE">
<unique-column name="name" />

2
local/modules/Front/Controller/ContactController.php
View File

@@ -47,7 +47,7 @@ class ContactController extends BaseFrontController
$message = \Swift_Message::newInstance($form->get('subject')->getData())
->addFrom($form->get('email')->getData(), $form->get('name')->getData())
->addTo(ConfigQuery::read('contact_email'), ConfigQuery::read('company_name'))
->addTo(ConfigQuery::read('store_email'), ConfigQuery::read('store_name'))
->setBody($form->get('message')->getData())
;