From f1e24553157bc93e3159eaf36c17b0a186158244 Mon Sep 17 00:00:00 2001 From: franck Date: Wed, 11 Sep 2013 09:50:47 +0200 Subject: [PATCH 1/3] fixed typo --- core/lib/Thelia/Controller/Admin/BaseAdminController.php | 1 + core/lib/Thelia/Core/Template/Assets/AsseticHelper.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index 21fffd3d9..84f2e39ae 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -39,6 +39,7 @@ use Thelia\Model\LangQuery; use Thelia\Form\BaseForm; use Thelia\Form\Exception\FormValidationException; use Thelia\Log\Tlog; +use Symfony\Component\Routing\Router; class BaseAdminController extends BaseController { diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php index a3323ae2a..294fa9e92 100755 --- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php +++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php @@ -124,7 +124,7 @@ class AsseticHelper // // before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files. // - if ($dev_mode == true || ! file_exists($target_file)) { + if (/*$dev_mode == true || */! file_exists($target_file)) { // Delete previous version of the file list($commonPart, $dummy) = explode('-', $asset_target_path); From ae786f2139f80a657bb6fc8e7cb19992ce65e04f Mon Sep 17 00:00:00 2001 From: franck Date: Wed, 11 Sep 2013 12:14:39 +0200 Subject: [PATCH 2/3] Added process_assets config variable --- .../Core/Template/Assets/AsseticHelper.php | 36 ++++++++++--------- install/insert.sql | 4 +-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php index 294fa9e92..349fa178a 100755 --- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php +++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php @@ -29,6 +29,7 @@ use Assetic\Filter; use Assetic\Factory\AssetFactory; use Assetic\Factory\Worker\CacheBustingWorker; use Assetic\AssetWriter; +use Thelia\Model\ConfigQuery; /** * This class is a simple helper for generating assets using Assetic. @@ -124,27 +125,30 @@ class AsseticHelper // // before generating 3bc974a-ad3ef47.css, delete 3bc974a-* files. // - if (/*$dev_mode == true || */! file_exists($target_file)) { + if ($dev_mode == true || ! file_exists($target_file)) { - // Delete previous version of the file - list($commonPart, $dummy) = explode('-', $asset_target_path); + if (ConfigQuery::read('process_assets', true)) { - foreach (glob("$output_path/$commonPart-*") as $filename) { - @unlink($filename); - } + // Delete previous version of the file + list($commonPart, $dummy) = explode('-', $asset_target_path); - // Apply filters now - foreach ($filter_list as $filter) { - if ('?' != $filter[0]) { - $asset->ensureFilter($fm->get($filter)); - } elseif (!$debug) { - $asset->ensureFilter($fm->get(substr($filter, 1))); + foreach (glob("$output_path/$commonPart-*") as $filename) { + @unlink($filename); } + + // Apply filters now + foreach ($filter_list as $filter) { + if ('?' != $filter[0]) { + $asset->ensureFilter($fm->get($filter)); + } elseif (!$debug) { + $asset->ensureFilter($fm->get(substr($filter, 1))); + } + } + + $writer = new AssetWriter($output_path); + + $writer->writeAsset($asset); } - - $writer = new AssetWriter($output_path); - - $writer->writeAsset($asset); } return rtrim($output_url, '/').'/'.$asset_target_path; diff --git a/install/insert.sql b/install/insert.sql index da1414ce3..4ef9de276 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -17,8 +17,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat ('image_cache_dir_from_web_root', 'cache/images', 0, 0, NOW(), NOW()), ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()), ('page_not_found_view', '404.html', 0, 0, NOW(), NOW()), -('use_tax_free_amounts', 1, 1, 0, NOW(), NOW()); - +('use_tax_free_amounts', '1', 0, 0, NOW(), NOW()); +('process_assets', '1', 0, 0, NOW(), NOW()); INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()); From 36d2b873ff9d460dac737e8210c5771f3a5cd4ad Mon Sep 17 00:00:00 2001 From: franck Date: Wed, 11 Sep 2013 15:08:56 +0200 Subject: [PATCH 3/3] Removed a redondant "use" --- core/lib/Thelia/Controller/Admin/BaseAdminController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php index f2d76f5ab..4fb8bf31e 100755 --- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php +++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php @@ -25,7 +25,6 @@ namespace Thelia\Controller\Admin; use Symfony\Component\Routing\Exception\InvalidParameterException; use Symfony\Component\Routing\Exception\MissingMandatoryParametersException; use Symfony\Component\Routing\Exception\RouteNotFoundException; -use Symfony\Component\Routing\Router; use Thelia\Controller\BaseController; use Symfony\Component\HttpFoundation\Response; use Thelia\Core\Security\Exception\AuthorizationException;