From ed836e081c6abc71d69694e47cbc7e72e90bc80d Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Wed, 12 Dec 2012 14:37:15 +0100 Subject: [PATCH] //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option --- .../performance/helpers/form/form.tpl | 4 ---- classes/Media.php | 19 ----------------- .../admin/AdminPerformanceController.php | 21 ------------------- controllers/admin/AdminThemesController.php | 1 - install-dev/upgrade/sql/1.5.2.1.sql | 1 + 5 files changed, 1 insertion(+), 45 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl index 2e1d68908..9af307455 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl @@ -194,10 +194,6 @@ $('#features_detachables_up').val('true'); }); - $('input[name="PS_CSS_THEME_CACHE"], input[name="PS_JS_THEME_CACHE"], input[name="PS_HTML_THEME_COMPRESSION"], input[name="PS_JS_HTML_THEME_COMPRESSION"], input[name="PS_HIGH_HTML_THEME_COMPRESSION"]').change(function(){ - $('#ccc_up').val(1); - }); - $('input[name="_MEDIA_SERVER_1_"], input[name="_MEDIA_SERVER_2_"], input[name="_MEDIA_SERVER_3_"]').change(function(){ $('#media_server_up').val(1); }); diff --git a/classes/Media.php b/classes/Media.php index c19ad1e26..9a123e8b9 100755 --- a/classes/Media.php +++ b/classes/Media.php @@ -74,25 +74,6 @@ class MediaCore $html_content = str_replace(chr(194).chr(160), ' ', $html_content); $html_content = Minify_HTML::minify($html_content, array('xhtml', 'cssMinifier', 'jsMinifier')); - if (Configuration::get('PS_HIGH_HTML_THEME_COMPRESSION')) - { - //$html_content = preg_replace('/"([^\>\s"]*)"/i', '$1', $html_content);//FIXME create a js bug - $html_content = preg_replace('/]*dtd\">/is', '', $html_content); - $html_content = preg_replace('/\s\>/is', '>', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('', '', $html_content); - //$html_content = str_replace('

', '', $html_content);//FIXME doesnt work... - $html_content = str_replace("\n", '', $html_content);//TODO with bellow - $html_content = str_replace('', '', $html_content); - $html_content = str_replace('