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

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

Browse Source
This commit is contained in:
franck
2013-06-19 17:14:40 +02:00
parent b7dc6bd123 a114e559d2
commit 86e612bd59
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Admin/Controller/BaseAdminController.php
View File

@@ -45,7 +45,7 @@ class BaseAdminController
$this->parser = $parser; $this->parser = $parser;
// FIXME: should be red from config // FIXME: should be read from config
$this->parser->setTemplate('admin/default'); $this->parser->setTemplate('admin/default');
} }

1
core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterParserPluginPass.php
View File

@@ -32,7 +32,6 @@ use Symfony\Component\DependencyInjection\Reference;
* Register parser plugins. These plugins shouild be tagged thelia.parser.register_plugin * Register parser plugins. These plugins shouild be tagged thelia.parser.register_plugin
* in the configuration. * in the configuration.
* *
* @author Franck Allimant <franck@cqfdev.fr>
* *
*/ */
class RegisterParserPluginPass implements CompilerPassInterface { class RegisterParserPluginPass implements CompilerPassInterface {

2
core/lib/Thelia/Tpex

Submodule core/lib/Thelia/Tpex updated: 8561f3516e...b1c517281e

2
web/.htaccess
View File

@@ -8,7 +8,5 @@ AddDefaultCharset UTF-8
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteBase /thelia2
RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA] RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
</IfModule> </IfModule>