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

Merge branch 'smarty' into admin

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/EventListener/ViewListener.php
	core/lib/Thelia/Core/Template/SmartyParser.php
	templates/smarty-sample/index.html
This commit is contained in:
franck
2013-06-19 11:20:41 +02:00
parent 8244efdb1d dfafe36730
commit 2eca5464b7
19 changed files with 9846 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -50,6 +50,10 @@
</call>
</service>
<service id="smarty.plugin.assetic" class="Thelia\Core\Template\Smarty\Plugins\Assetic" >
<tag name="smarty.register_plugin"/>
</service>
<service id="http_kernel" class="Thelia\Core\TheliaHttpKernel">
<argument type="service" id="event_dispatcher" />
<argument type="service" id="service_container" />