Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2012-12-29 14:31:10 +01:00
commit 37d3c24006
2 changed files with 2 additions and 1 deletions

View File

@ -85,6 +85,7 @@ VerboseMultiSubmit, ReplaceHelpImg
3.5.6.0 (not yet released)
- bug #3593604 [status] Erroneous advisor rule
- bug #3596070 [status] localStorage broken in server status monitor
- bug #3598736 [routines] Editing a procedure with special characters
3.5.5.0 (2012-12-21)
- bug #3563824 [export] Support Apache's mod_deflate

View File

@ -823,7 +823,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
'item_comment'
);
foreach ($need_escape as $key => $index) {
$routine[$index] = htmlentities($routine[$index], ENT_QUOTES);
$routine[$index] = htmlentities($routine[$index], ENT_QUOTES, 'UTF-8');
}
for ($i=0; $i<$routine['item_num_params']; $i++) {
$routine['item_param_name'][$i] = htmlentities(