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

Merge pull request #13892 from williamdes/patch-2

Browse Source 
Fix charset error when creating/editing routines; bug #13889
This commit is contained in:
Michal Čihař 2018-02-20 05:40:33 +01:00 committed by GitHub
commit 68ece7b2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/classes/Rte/Routines.php
View File

@ -1202,10 +1202,12 @@ class Routines
}
if (! empty($_REQUEST['item_param_opts_text'][$i])) {
if ($dbi->types->getTypeClass($item_param_type[$i]) == 'CHAR') {
$params .= ' CHARSET '
. mb_strtolower(
$_REQUEST['item_param_opts_text'][$i]
);
if(!in_array($item_param_type[$i],array("VARBINARY","BINARY"))){
$params .= ' CHARSET '
. mb_strtolower(
$_REQUEST['item_param_opts_text'][$i]
);
}
}
}
if (! empty($_REQUEST['item_param_opts_num'][$i])) {