From dafc17c52ef1c0bd7480abcff1899273cd7bead3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 22 May 2019 18:32:42 -0300 Subject: [PATCH] Add explicit parentheses in nested ternary operators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MaurĂ­cio Meneghini Fauth --- ChangeLog | 1 + libraries/classes/DatabaseInterface.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90401f4489..3733ff9294 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ phpMyAdmin - ChangeLog - issue Fixed editing of virtual columns on PerconaDB - issue #13854 Fixed column options are ignored for GENERATED/VIRTUAL/STORED columns - issue #15262 Fixed incorrect display of charset column (raw html) +- issue Added explicit parentheses in nested ternary operators 4.8.5 (2019-01-25) - issue Developer debug data was saved to the PHP error log diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index 6a6ddfeb5d..6e3d998b81 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -610,9 +610,9 @@ class DatabaseInterface function ($a, $b) { $aLength = $a['Data_length'] + $a['Index_length']; $bLength = $b['Data_length'] + $b['Index_length']; - return ($aLength == $bLength) + return $aLength == $bLength ? 0 - : ($aLength < $bLength) ? -1 : 1; + : ($aLength < $bLength ? -1 : 1); } );