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

core/lib/Thelia/Admin/Controller/BaseAdminController.php

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

core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterParserPluginPass.php

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

web/.htaccess

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