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

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())
;