gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-11-03 23:57:41 -08:00
commit ea01a45eda
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/DisplayResults.class.php
View File

@ -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);
}

2
libraries/server_status_variables.lib.php
View File

@ -253,7 +253,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
$retval .= '<span class="allfine">';
}
}
if (substr($name, -1)) {
if (substr($name, -1) === '%') {
$retval .= htmlspecialchars(PMA_Util::formatNumber($value, 0, 2)) . ' %';
} elseif (strpos($name, 'Uptime') !== false) {
$retval .= htmlspecialchars(