diff options
| author | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-11-13 02:50:42 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-11-13 02:50:42 +0300 |
| commit | d7affca556148eab13f58986334eac895a432f1f (patch) | |
| tree | 5ae440ca7597af328160e65ab483790bb3f04265 /libraries | |
| parent | 2d0dbca50a3945bc58b4b6b513ba89dbcc76c265 (diff) | |
Fix uncaught TypeError in Util::printableBitValue
Fixes #14718
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/classes/Controllers/Table/TableSearchController.php | 4 | ||||
| -rw-r--r-- | libraries/classes/Display/Results.php | 4 | ||||
| -rw-r--r-- | libraries/classes/InsertEdit.php | 4 | ||||
| -rw-r--r-- | libraries/classes/Plugins/Export/ExportSql.php | 4 | ||||
| -rw-r--r-- | libraries/classes/Util.php | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php index 64bb527682..fbe5f0c0e9 100644 --- a/libraries/classes/Controllers/Table/TableSearchController.php +++ b/libraries/classes/Controllers/Table/TableSearchController.php @@ -453,8 +453,8 @@ class TableSearchController extends TableController foreach ($row as $col => $val) { if ($fields_meta[$i]->type == 'bit') { $row[$col] = Util::printableBitValue( - $val, - $fields_meta[$i]->length + (int) $val, + (int) $fields_meta[$i]->length ); } $i++; diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index cddec4086b..259b6c2e28 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -4049,8 +4049,8 @@ class Results $formatted = false; if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) { $column = Util::printableBitValue( - $column, - $meta->length + (int) $column, + (int) $meta->length ); // some results of PROCEDURE ANALYSE() are reported as diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 5d2f922ae5..6e60f3cc6a 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -2001,8 +2001,8 @@ class InsertEdit $special_chars = $as_is ? $current_row[$column['Field']] : Util::printableBitValue( - $current_row[$column['Field']], - $extracted_columnspec['spec_in_brackets'] + (int) $current_row[$column['Field']], + (int) $extracted_columnspec['spec_in_brackets'] ); } elseif ((substr($column['True_Type'], 0, 9) == 'timestamp' || $column['True_Type'] == 'datetime' diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index 98efc1bc3a..68d0046da0 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -2457,8 +2457,8 @@ class ExportSql extends ExportPlugin // detection of 'bit' works only on mysqli extension $values[] = "b'" . $GLOBALS['dbi']->escapeString( Util::printableBitValue( - $row[$j], - $fields_meta[$j]->length + (int) $row[$j], + (int) $fields_meta[$j]->length ) ) . "'"; diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 67a536fbe6..6543d86e73 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2067,7 +2067,7 @@ class Util } } elseif ($meta->type == 'bit') { $con_val = "= b'" - . self::printableBitValue($row[$i], $meta->length) . "'"; + . self::printableBitValue((int) $row[$i], (int) $meta->length) . "'"; } else { $con_val = '= \'' . $GLOBALS['dbi']->escapeString($row[$i]) . '\''; @@ -2773,12 +2773,12 @@ class Util * function because in PHP, decbin() supports only 32 bits * on 32-bit servers * - * @param integer $value coming from a BIT field - * @param integer $length length + * @param int $value coming from a BIT field + * @param int $length length * - * @return string the printable value + * @return string the printable value */ - public static function printableBitValue($value, $length) + public static function printableBitValue(int $value, int $length): string { // if running on a 64-bit server or the length is safe for decbin() if (PHP_INT_SIZE == 8 || $length < 33) { |