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 
Conflicts:
	core/lib/Thelia/Admin/Templating/Template.class.php
This commit is contained in:
franck
2013-06-18 15:35:36 +02:00
parent 797f0e2e38 fa69e6e7f0
commit 0719c8b740
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -16,3 +16,4 @@ coverage
.settings/ .settings/
local/cache/* local/cache/*
composer.lock composer.lock
web/assets/*

1
core/lib/Thelia/Admin/Templating/Template.class.php → core/lib/Thelia/Admin/Templating/Template.php
View File

@@ -41,6 +41,7 @@ class Template extends Smarty
if (! is_dir($cache_dir)) @mkdir($cache_dir, 0777, true); if (! is_dir($cache_dir)) @mkdir($cache_dir, 0777, true);
$web_root = THELIA_WEB_DIR; $web_root = THELIA_WEB_DIR;
$asset_dir_from_web_root = 'assets/admin/default'; // FIXME $asset_dir_from_web_root = 'assets/admin/default'; // FIXME
$this->asset_manager = new AssetsManager($web_root, $asset_dir_from_web_root); $this->asset_manager = new AssetsManager($web_root, $asset_dir_from_web_root);

4
web/.htaccess Normal file → Executable file
View File

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