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

Merge branch 'admin' of github.com:thelia/thelia into admin

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
This commit is contained in:
Manuel Raynaud
2013-06-19 17:18:00 +02:00
parent c5f73f441f 86e612bd59
commit 617a814f0f
7 changed files with 334 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,14 +4,24 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd">
<testLoops>
<testLoop name="equal" class="Thelia\Core\Template\TestLoop\Equal"/>
</testLoops>
<loops>
<loop class="Thelia\Core\Template\Loop\Category" name="category"/>
</loops>
<filters>
<!-- Sample definition
<filter class="Thelia\Core\Template\Filter\SomeFilterClass" name="my_filter"/>
-->
</filters>
<templateDirectives>
<!-- Sample definition
<templateDirectives class="Thelia\Core\Template\Filter\SomeFilterClass" name="my_filter"/>
-->
</templateDirectives>
<commands>
<command class="Thelia\Command\CacheClear"/>
<command class="Thelia\Command\Install"/>
@@ -55,17 +65,24 @@
<argument type="service" id="request" />
<argument type="service" id="event_dispatcher"/>
<call method="setLoopList">
<argument>%tpex.loop%</argument>
<argument>%thelia.parser.loops%</argument>
</call>
</service>
<service id="smarty.plugin.translation" class="Thelia\Core\Template\Smarty\Plugins\Translation" >
<tag name="thelia.parser.register_plugin"/>
</service>
<service id="smarty.plugin.module" class="Thelia\Core\Template\Smarty\Plugins\Module" >
<tag name="thelia.parser.register_plugin"/>
</service>
<service id="http_kernel" class="Thelia\Core\TheliaHttpKernel">
<argument type="service" id="event_dispatcher" />
<argument type="service" id="service_container" />
<argument type="service" id="controller_resolver" />
</service>
<service id="request" scope="request" synthetic="true" />
<service id="service_container" synthetic="true" />