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

Merge #15849 - Fix #15831 - DB names starting with "b" being cut off in <option>, User account page

Browse Source 
Fixes: #15831
Pull-request: #15849
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-01-25 21:02:15 +01:00
commit 7dd193aa7b
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Util.php
View File

@ -2858,7 +2858,7 @@ class Util
*/
public static function convertBitDefaultValue($bit_default_value)
{
return rtrim(ltrim(htmlspecialchars_decode($bit_default_value, ENT_QUOTES), "b'"), "'");
return preg_replace("/^b'(\d*)'?$/", '$1', htmlspecialchars_decode($bit_default_value, ENT_QUOTES), 1);
}
/**

16
test/classes/UtilTest.php
View File

@ -483,6 +483,22 @@ class UtilTest extends PmaTestCase
"b'010111010'",
"010111010",
],
"database name starting with b" => [
"big database",
"big database",
],
"database name containing b'" => [
"a b'ig database",
"a b'ig database",
],
"database name in single quotes" => [
"'a*database*name'",
"'a*database*name'",
],
"database name with multiple b'" => [
"b'ens datab'ase'",
"b'ens datab'ase'",
],
];
}