Merge branch 'master' of github.com:thelia/thelia

2013-10-31 15:33:30 +01:00
parent 07c5dd4a51 af5d28ac6e
commit 899a154350
23 changed files with 616 additions and 336 deletions
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -199,7 +199,7 @@ class BaseAdminController extends BaseController
        $parser = $this->container->get("thelia.parser");

        // Define the template thant shoud be used
-        $parser->setTemplate($template ?: ConfigQuery::read('base_admin_template', 'admin/default'));
+        $parser->setTemplate($template ?: ConfigQuery::read('base-admin-template', 'admin/default'));

        return $parser;
    }