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

[-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities

Browse Source
This commit is contained in:
gRoussac
2013-11-03 22:59:04 +01:00
parent 2a3192d98c
commit c7323c2bfe
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+8 -2
View File
@@ -672,14 +672,20 @@ 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); {
$string = array_map(array('Tools', 'htmlentitiesUTF8'), $string);
return (string)array_shift($string);
}
return htmlentities((string)$string, $type, 'utf-8'); return htmlentities((string)$string, $type, 'utf-8');
} }
public static function htmlentitiesDecodeUTF8($string) public static function htmlentitiesDecodeUTF8($string)
{ {
if (is_array($string)) if (is_array($string))
return array_map(array('Tools', 'htmlentitiesDecodeUTF8'), $string); {
$string = array_map(array('Tools', 'htmlentitiesDecodeUTF8'), $string);
return (string)array_shift($string);
}
return html_entity_decode((string)$string, ENT_QUOTES, 'utf-8'); return html_entity_decode((string)$string, ENT_QUOTES, 'utf-8');
} }
modules/blocksearch/blocksearch-top.tpl
+2 -2
View File
@@ -29,7 +29,7 @@
<input type="hidden" name="controller" value="search" /> <input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderby" value="position" /> <input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" /> <input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" /> <input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
</form> </form>
</div> </div>
{else} {else}
@@ -41,7 +41,7 @@
<input type="hidden" name="controller" value="search" /> <input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderby" value="position" /> <input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" /> <input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="text" id="search_query_top" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" /> <input class="search_query" type="text" id="search_query_top" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
<input type="submit" name="submit_search" value="{l s='Search' mod='blocksearch'}" class="button" /> <input type="submit" name="submit_search" value="{l s='Search' mod='blocksearch'}" class="button" />
</p> </p>
</form> </form>
modules/blocksearch/blocksearch.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
<input type="hidden" name="controller" value="search" /> <input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderby" value="position" /> <input type="hidden" name="orderby" value="position" />
<input type="hidden" name="orderway" value="desc" /> <input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" /> <input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
<input type="submit" id="search_button" class="button_mini" value="{l s='Go!' mod='blocksearch'}" /> <input type="submit" id="search_button" class="button_mini" value="{l s='Go!' mod='blocksearch'}" />
</p> </p>
</form> </form>
themes/default/modules/blocksearch/blocksearch.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
<input type="hidden" name="orderby" value="position" /> <input type="hidden" name="orderby" value="position" />
<input type="hidden" name="controller" value="search" /> <input type="hidden" name="controller" value="search" />
<input type="hidden" name="orderway" value="desc" /> <input type="hidden" name="orderway" value="desc" />
<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" /> <input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" /> <input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
</p> </p>
</form> </form>