From ebcc6c62f20881f7a6bdc53784a223c70d568c90 Mon Sep 17 00:00:00 2001 From: Perfectionist Date: Sun, 2 Nov 2014 19:23:53 -0600 Subject: [PATCH 1/2] Fix Status->All status variables to display correct suffix and formatting. Broken by f9cd1a1a227d193dc8a70decb8e59607deb3e165 Signed-off-by: Daniel Rix --- libraries/server_status_variables.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php index 0bf172dadd..98ee527e57 100644 --- a/libraries/server_status_variables.lib.php +++ b/libraries/server_status_variables.lib.php @@ -253,7 +253,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu $retval .= ''; } } - if (substr($name, -1)) { + if (substr($name, -1) === '%') { $retval .= htmlspecialchars(PMA_Util::formatNumber($value, 0, 2)) . ' %'; } elseif (strpos($name, 'Uptime') !== false) { $retval .= htmlspecialchars( From 54a9d84a1156c7d9ec53511bcfa9e719967aacb2 Mon Sep 17 00:00:00 2001 From: Chanaka Dharmarathna Date: Mon, 3 Nov 2014 22:58:17 +0530 Subject: [PATCH 2/2] Remove duplicated condition and fixed phpcs error Signed-off-by: Chanaka Dharmarathna --- libraries/DisplayResults.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index dd96e29e22..7a3a436e28 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3969,10 +3969,8 @@ class PMA_DisplayResults } elseif (((substr($meta->type, 0, 9) == self::TIMESTAMP_FIELD) || ($meta->type == self::DATETIME_FIELD) - || ($meta->type == self::TIME_FIELD) || ($meta->type == self::TIME_FIELD)) - // micro seconds delimiter - && (/*overload*/mb_strpos($column, ".") !== false) + && (/*overload*/mb_strpos($column, ".") !== false) // micro seconds delimiter ) { $column = PMA_Util::addMicroseconds($column); }