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

Merge branch 'master' into template

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
This commit is contained in:
Etienne Roudeix
2013-09-18 20:03:13 +02:00
parent 891ebcd491 42ad62d2cd
commit 66536d0b31
350 changed files with 17179 additions and 5649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
local/modules/TheliaDebugBar/Smarty/Plugin/DebugBar.php
View File

@@ -71,7 +71,11 @@ class DebugBar extends AbstractSmartyPlugin
}
}
file_put_contents($cssFile, $assetCss->dump());
if(!file_exists(THELIA_WEB_DIR . "/cache")) {
@mkdir(THELIA_WEB_DIR . "/cache");
}
@file_put_contents($cssFile, $assetCss->dump());
}
$render = sprintf('<link rel="stylesheet" href="%s">', URL::getInstance()->absoluteUrl($webFile, array(), URL::PATH_TO_FILE));
}
@@ -96,7 +100,11 @@ class DebugBar extends AbstractSmartyPlugin
}
}
file_put_contents($cacheFile, $assetJs->dump());
if(!file_exists(THELIA_WEB_DIR . "/cache")) {
@mkdir(THELIA_WEB_DIR . "/cache");
}
@file_put_contents($cacheFile, $assetJs->dump());
}
$render = sprintf('<script src="%s"></script>', URL::getInstance()->absoluteUrl($webFile, array(), URL::PATH_TO_FILE));