dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option

Browse Source
This commit is contained in:
vAugagneur
2012-12-12 14:37:15 +01:00
parent 16b726349f
commit ed836e081c
5 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
-4
View File
@@ -194,10 +194,6 @@
$('#features_detachables_up').val('true'); $('#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(){ $('input[name="_MEDIA_SERVER_1_"], input[name="_MEDIA_SERVER_2_"], input[name="_MEDIA_SERVER_3_"]').change(function(){
$('#media_server_up').val(1); $('#media_server_up').val(1);
}); });
classes/Media.php
-19
View File
@@ -74,25 +74,6 @@ class MediaCore
$html_content = str_replace(chr(194).chr(160), ' ', $html_content); $html_content = str_replace(chr(194).chr(160), ' ', $html_content);
$html_content = Minify_HTML::minify($html_content, array('xhtml', 'cssMinifier', 'jsMinifier')); $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('/<!DOCTYPE \w[^\>]*dtd\">/is', '', $html_content);
$html_content = preg_replace('/\s\>/is', '>', $html_content);
$html_content = str_replace('</li>', '', $html_content);
$html_content = str_replace('</dt>', '', $html_content);
$html_content = str_replace('</dd>', '', $html_content);
$html_content = str_replace('</head>', '', $html_content);
$html_content = str_replace('<head>', '', $html_content);
$html_content = str_replace('</html>', '', $html_content);
$html_content = str_replace('</body>', '', $html_content);
//$html_content = str_replace('</p>', '', $html_content);//FIXME doesnt work...
$html_content = str_replace("</option>\n", '', $html_content);//TODO with bellow
$html_content = str_replace('</option>', '', $html_content);
$html_content = str_replace('<script type=text/javascript>', '<script>', $html_content);//Do a better expreg
$html_content = str_replace("<script>\n", '<script>', $html_content);//Do a better expreg
}
return $html_content; return $html_content;
} }
return false; return false;
controllers/admin/AdminPerformanceController.php
-21
View File
@@ -269,25 +269,6 @@ class AdminPerformanceControllerCore extends AdminController
) )
) )
), ),
array(
'type' => 'radio',
'label' => $this->l('High risk HTML compression'),
'name' => 'PS_HIGH_HTML_THEME_COMPRESSION',
'class' => 't',
'br' => true,
'values' => array(
array(
'id' => 'PS_HIGH_HTML_THEME_COMPRESSION_1',
'value' => 1,
'label' => $this->l('HTML is compressed but cancels the W3C validation (only when "Minify HTML" is enabled)')
),
array(
'id' => 'PS_HIGH_HTML_THEME_COMPRESSION_0',
'value' => 0,
'label' => $this->l('Keep W3C validation')
)
)
),
array( array(
'type' => 'radio', 'type' => 'radio',
'label' => $this->l('Apache optimization'), 'label' => $this->l('Apache optimization'),
@@ -315,7 +296,6 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_value['PS_JS_THEME_CACHE'] = Configuration::get('PS_JS_THEME_CACHE'); $this->fields_value['PS_JS_THEME_CACHE'] = Configuration::get('PS_JS_THEME_CACHE');
$this->fields_value['PS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HTML_THEME_COMPRESSION'); $this->fields_value['PS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HTML_THEME_COMPRESSION');
$this->fields_value['PS_JS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_JS_HTML_THEME_COMPRESSION'); $this->fields_value['PS_JS_HTML_THEME_COMPRESSION'] = Configuration::get('PS_JS_HTML_THEME_COMPRESSION');
$this->fields_value['PS_HIGH_HTML_THEME_COMPRESSION'] = Configuration::get('PS_HIGH_HTML_THEME_COMPRESSION');
$this->fields_value['PS_HTACCESS_CACHE_CONTROL'] = Configuration::get('PS_HTACCESS_CACHE_CONTROL'); $this->fields_value['PS_HTACCESS_CACHE_CONTROL'] = Configuration::get('PS_HTACCESS_CACHE_CONTROL');
$this->fields_value['ccc_up'] = 1; $this->fields_value['ccc_up'] = 1;
} }
@@ -640,7 +620,6 @@ class AdminPerformanceControllerCore extends AdminController
!Configuration::updateValue('PS_JS_THEME_CACHE', (int)Tools::getValue('PS_JS_THEME_CACHE')) || !Configuration::updateValue('PS_JS_THEME_CACHE', (int)Tools::getValue('PS_JS_THEME_CACHE')) ||
!Configuration::updateValue('PS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HTML_THEME_COMPRESSION')) || !Configuration::updateValue('PS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HTML_THEME_COMPRESSION')) ||
!Configuration::updateValue('PS_JS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_JS_HTML_THEME_COMPRESSION')) || !Configuration::updateValue('PS_JS_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_JS_HTML_THEME_COMPRESSION')) ||
!Configuration::updateValue('PS_HIGH_HTML_THEME_COMPRESSION', (int)Tools::getValue('PS_HIGH_HTML_THEME_COMPRESSION')) ||
!Configuration::updateValue('PS_HTACCESS_CACHE_CONTROL', (int)Tools::getValue('PS_HTACCESS_CACHE_CONTROL'))) !Configuration::updateValue('PS_HTACCESS_CACHE_CONTROL', (int)Tools::getValue('PS_HTACCESS_CACHE_CONTROL')))
$this->errors[] = Tools::displayError('Unknown error.'); $this->errors[] = Tools::displayError('Unknown error.');
else else
controllers/admin/AdminThemesController.php
-1
View File
@@ -50,7 +50,6 @@ class AdminThemesControllerCore extends AdminController
'PS_JS_THEME_CACHE' => 0, 'PS_JS_THEME_CACHE' => 0,
'PS_HTML_THEME_COMPRESSION' => 0, 'PS_HTML_THEME_COMPRESSION' => 0,
'PS_JS_HTML_THEME_COMPRESSION' => 0, 'PS_JS_HTML_THEME_COMPRESSION' => 0,
'PS_HIGH_HTML_THEME_COMPRESSION' => 0,
), ),
), ),
), ),
install-dev/upgrade/sql/1.5.2.1.sql
+1
View File
@@ -16,3 +16,4 @@ UPDATE `PREFIX_order_state` SET `send_email` = 1 WHERE `id_order_state` = (SELEC
UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1); UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_state` = (SELECT `value` FROM `PREFIX_configuration` WHERE `name` = 'PS_OS_WS_PAYMENT' LIMIT 1);
DELETE FROM `PREFIX_configuration` WHERE `name`= 'PS_HIGH_HTML_THEME_COMPRESSION';