Merge pull request #15404 from jfcherng/fix-php74-curly-braces

Fix PHP 7.4 deprecation: array/string curly braces access
This commit is contained in:
Maurício Meneghini Fauth 2019-07-29 21:35:50 -03:00 committed by GitHub
commit a0c4786fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -3872,7 +3872,7 @@ class Privileges
}
$drop_user_error = '';
foreach ($queries as $sql_query) {
if ($sql_query{0} != '#') {
if ($sql_query[0] != '#') {
if (! $GLOBALS['dbi']->tryQuery($sql_query)) {
$drop_user_error .= $GLOBALS['dbi']->getError() . "\n";
}
@ -4119,7 +4119,7 @@ class Privileges
{
$tmp_count = 0;
foreach ($queries as $sql_query) {
if ($sql_query{0} != '#') {
if ($sql_query[0] != '#') {
$GLOBALS['dbi']->query($sql_query);
}
// when there is a query containing a hidden password, take it

View File

@ -248,7 +248,7 @@ class Url
if (mb_strpos($arg_separator, ';') !== false) {
$separator = ';';
} elseif (strlen($arg_separator) > 0) {
$separator = $arg_separator{0};
$separator = $arg_separator[0];
} else {
$separator = '&';
}