gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Browse Source
This commit is contained in:
Weblate 2012-12-29 14:31:19 +01:00
commit 7e1f6d1424
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
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

2
libraries/rte/rte_routines.lib.php
View File

@ -770,7 +770,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(