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

// Normalization

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9321 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte committed 2011-10-13 15:27:41 +00:00
1 parent 7d7d3bfdd4
commit da6641ca10
2 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/tabs/AdminSuppliers.php
+9 -9
View File
@@ -80,14 +80,14 @@ class AdminSuppliers extends AdminTab
echo ' echo '
<h3><a href="index.php?tab=AdminCatalog&id_product='.$product->id.'&addproduct&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$this->context->employee->id).'" target="_blank">'.$product->name.'</a></h3> <h3><a href="index.php?tab=AdminCatalog&id_product='.$product->id.'&addproduct&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$this->context->employee->id).'" target="_blank">'.$product->name.'</a></h3>
<table border="0" cellpadding="0" cellspacing="0" class="table" style="width: 600px;"> <table border="0" cellpadding="0" cellspacing="0" class="table" style="width: 600px;">
<tr> <tr>
<th>'.$this->l('Attribute name').'</th> <th>'.$this->l('Attribute name').'</th>
<th width="80">'.$this->l('Reference').'</th> <th width="80">'.$this->l('Reference').'</th>
<th width="80">'.$this->l('EAN13').'</th> <th width="80">'.$this->l('EAN13').'</th>
<th width="80">'.$this->l('UPC').'</th> <th width="80">'.$this->l('UPC').'</th>
'.(Configuration::get('PS_STOCK_MANAGEMENT') ? '<th class="right" width="40">'.$this->l('Quantity').'</th>' : '').' '.(Configuration::get('PS_STOCK_MANAGEMENT') ? '<th class="right" width="40">'.$this->l('Quantity').'</th>' : '').'
</tr>'; </tr>';
/* Build attributes combinaisons */ /* Build attributes combinaisons */
$combinaisons = $product->getAttributeCombinaisons($this->context->language->id); $combinaisons = $product->getAttributeCombinaisons($this->context->language->id);
foreach ($combinaisons AS $k => $combinaison) foreach ($combinaisons AS $k => $combinaison)
{ {
@@ -150,7 +150,7 @@ class AdminSuppliers extends AdminTab
</div> </div>
<label>'.$this->l('Logo:').' </label> <label>'.$this->l('Logo:').' </label>
<div class="margin-form">'; <div class="margin-form">';
echo $this->displayImage($supplier->id, _PS_SUPP_IMG_DIR_.$supplier->id.'.jpg', 350, NULL, NULL, true); echo $this->displayImage($supplier->id, _PS_SUPP_IMG_DIR_.$supplier->id.'.jpg', 350, NULL, NULL, true);
echo ' <br /><input type="file" name="logo" /> echo ' <br /><input type="file" name="logo" />
<p>'.$this->l('Upload supplier logo from your computer').'</p> <p>'.$this->l('Upload supplier logo from your computer').'</p>
</div> </div>
classes/Tools.php
+1 -1
View File
@@ -507,7 +507,7 @@ class ToolsCore
{ {
if (!$html) if (!$html)
$string = strip_tags($string); $string = strip_tags($string);
return @Tools::htmlentitiesUTF8($string, ENT_QUOTES);; return @Tools::htmlentitiesUTF8($string, ENT_QUOTES);
} }
public static function htmlentitiesUTF8($string, $type = ENT_QUOTES) public static function htmlentitiesUTF8($string, $type = ENT_QUOTES)