diff options
| author | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-11-13 04:14:05 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-11-13 04:14:05 +0300 |
| commit | b5c9c637895e07ae64b3fecd86ae7aa60fcfec32 (patch) | |
| tree | c6e56a2aab826d28ce95ccc0326a224527e01483 /libraries | |
| parent | 399f45e0a9f65ff881e3fdf8328f87197e263dfc (diff) | |
Fix some uncaught type errors
Fixes #14394
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/classes/Import.php | 2 | ||||
| -rw-r--r-- | libraries/classes/Navigation/Nodes/Node.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php index cb88e9e3be..d26ef100c9 100644 --- a/libraries/classes/Import.php +++ b/libraries/classes/Import.php @@ -315,7 +315,7 @@ class Import ?array $import_run_buffer, string $sql, string $full - ): array { + ): ?array { if (!empty($sql) || !empty($full)) { $import_run_buffer = ['sql' => $sql, 'full' => $full]; return $import_run_buffer; diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index 37eecaf2ce..fadb7c50eb 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -481,7 +481,7 @@ class Node break; } } - $prefixes = array_slice(array_keys($prefixMap), $pos); + $prefixes = array_slice(array_keys($prefixMap), (int) $pos); } $query = "SHOW DATABASES "; @@ -490,7 +490,7 @@ class Node $subClauses = []; foreach ($prefixes as $prefix) { $subClauses[] = " LOCATE('" - . $GLOBALS['dbi']->escapeString((string)$prefix) . $dbSeparator + . $GLOBALS['dbi']->escapeString((string) $prefix) . $dbSeparator . "', " . "CONCAT(`Database`, '" . $dbSeparator . "')) = 1 "; } |