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

Conflicts: core/lib/Thelia/Admin/Templating/Template.class.php
2013-06-18 15:35:36 +02:00
parent 797f0e2e38 fa69e6e7f0
commit 0719c8b740
3 changed files with 5 additions and 1 deletions
--- a/core/lib/Thelia/Admin/Templating/Template.class.php
+++ b/core/lib/Thelia/Admin/Templating/Template.class.php
@@ -41,6 +41,7 @@ class Template extends Smarty
        if (! is_dir($cache_dir)) @mkdir($cache_dir, 0777, true);

        $web_root  = THELIA_WEB_DIR;
+
        $asset_dir_from_web_root = 'assets/admin/default'; // FIXME

        $this->asset_manager = new AssetsManager($web_root, $asset_dir_from_web_root);