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

[-] BO : fix #PSTEST-1114 - unrecognized chars in e-mail

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14385 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-03-30 13:42:50 +00:00
parent 16c232ed52
commit e774ee6ab1
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/combinations.tpl
+9 -10
View File
@@ -25,17 +25,16 @@
*} *}
<script type="text/javascript"> <script type="text/javascript">
{if $product->is_virtual} $(document).ready(function(){
$('#virtual_good_attributes').show(); {if $product->is_virtual}
{else} $('#virtual_good_attributes').show();
$('#virtual_good_attributes').hide(); {/if}
{/if}
var msg_combination_1 = '{l s='Please choose an attribute'}';
var msg_combination_2 = '{l s='Please choose a value'}';
var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
var msg_new_combination = '{l s='New combination'}';
var msg_combination_1 = '{l s='Please choose an attribute'}';
var msg_combination_2 = '{l s='Please choose a value'}';
var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
var msg_new_combination = '{l s='New combination'}';
});
</script> </script>
{if isset($product->id)} {if isset($product->id)}
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+1 -1
View File
@@ -221,7 +221,7 @@
<label for="virtual_product_name" class="t">{l s='Filename'}</label> <label for="virtual_product_name" class="t">{l s='Filename'}</label>
</td> </td>
<td class="col-right"> <td class="col-right">
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|htmlentities}" /> <input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'htmlall':'UTF-8'}" />
<p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p> <p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
</td> </td>
</tr> </tr>
cache/class_index.php
Vendored
+4 -4
View File
@@ -478,7 +478,7 @@
'OrderSlipCore' => 'classes/order/OrderSlip.php', 'OrderSlipCore' => 'classes/order/OrderSlip.php',
'OrderState' => 'override/classes/order/OrderState.php', 'OrderState' => 'override/classes/order/OrderState.php',
'OrderStateCore' => 'classes/order/OrderState.php', 'OrderStateCore' => 'classes/order/OrderState.php',
'PDF' => 'override/classes/PDF.php', 'PDF' => 'override/classes/pdf/PDF.php',
'PDFCore' => 'classes/pdf/PDF.php', 'PDFCore' => 'classes/pdf/PDF.php',
'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php', 'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php',
'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php', 'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php',
@@ -560,7 +560,7 @@
'StateCore' => 'classes/State.php', 'StateCore' => 'classes/State.php',
'StatisticsController' => 'override/controllers/front/StatisticsController.php', 'StatisticsController' => 'override/controllers/front/StatisticsController.php',
'StatisticsControllerCore' => 'controllers/front/StatisticsController.php', 'StatisticsControllerCore' => 'controllers/front/StatisticsController.php',
'Stock' => 'override/classes/Stock.php', 'Stock' => 'override/classes/stock/Stock.php',
'StockAvailable' => 'override/classes/stock/StockAvailable.php', 'StockAvailable' => 'override/classes/stock/StockAvailable.php',
'StockAvailableCore' => 'classes/stock/StockAvailable.php', 'StockAvailableCore' => 'classes/stock/StockAvailable.php',
'StockCore' => 'classes/stock/Stock.php', 'StockCore' => 'classes/stock/Stock.php',
@@ -571,9 +571,9 @@
'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php',
'StockManagerModule' => 'override/classes/stock/StockManagerModule.php', 'StockManagerModule' => 'override/classes/stock/StockManagerModule.php',
'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php', 'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php',
'StockMvt' => 'override/classes/StockMvt.php', 'StockMvt' => 'override/classes/stock/StockMvt.php',
'StockMvtCore' => 'classes/stock/StockMvt.php', 'StockMvtCore' => 'classes/stock/StockMvt.php',
'StockMvtReason' => 'override/classes/StockMvtReason.php', 'StockMvtReason' => 'override/classes/stock/StockMvtReason.php',
'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php',
'StockMvtWS' => 'override/classes/stock/StockMvtWS.php', 'StockMvtWS' => 'override/classes/stock/StockMvtWS.php',
'StockMvtWSCore' => 'classes/stock/StockMvtWS.php', 'StockMvtWSCore' => 'classes/stock/StockMvtWS.php',
classes/Tools.php
+1
View File
@@ -615,6 +615,7 @@ class ToolsCore
public static function htmlentitiesUTF8($string, $type = ENT_QUOTES) public static function htmlentitiesUTF8($string, $type = ENT_QUOTES)
{ {
if (is_array($string)) if (is_array($string))
return array_map(array('Tools', 'htmlentitiesUTF8'), $string); return array_map(array('Tools', 'htmlentitiesUTF8'), $string);
return htmlentities($string, $type, 'utf-8'); return htmlentities($string, $type, 'utf-8');
} }