diff options
| author | Christian Foellmann <foellmann@foe-services.de> | 2014-12-23 14:48:13 +0300 |
|---|---|---|
| committer | Christian Foellmann <foellmann@foe-services.de> | 2014-12-23 14:48:13 +0300 |
| commit | 2bfb20e57418ebf396149782be9f98e868fe8608 (patch) | |
| tree | a5ec4011410970603d3f462a535a5a359057fa77 /libraries/build_html_for_db.lib.php | |
| parent | 20f1bf77c8281efc675a14e0f6bf52f657dabd9a (diff) | |
UPDATE 4.3.34.3.3
Diffstat (limited to 'libraries/build_html_for_db.lib.php')
| -rw-r--r-- | libraries/build_html_for_db.lib.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php index b0d0176685..4737550b43 100644 --- a/libraries/build_html_for_db.lib.php +++ b/libraries/build_html_for_db.lib.php @@ -2,7 +2,7 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * HTML geneartor for database listing + * HTML generator for database listing * * @package PhpMyAdmin */ @@ -49,11 +49,9 @@ function PMA_getColumnOrder() 'format' => 'byte', 'footer' => 0, ); - $column_order['SCHEMA_DATA_FREE'] = array( - 'disp_name' => __('Overhead'), - 'format' => 'byte', - 'footer' => 0, - ); + // At this point we were preparing the display of Overhead using DATA_FREE + // but its content does not represent the real overhead in the case + // of InnoDB return $column_order; } @@ -90,7 +88,7 @@ function PMA_buildHtmlForDb( } $out .= '<td class="name">' . '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] - . '?' . $url_query . '&db=' + . $url_query . '&db=' . urlencode($current['SCHEMA_NAME']) . '" title="' . sprintf( __('Jump to database'), @@ -103,6 +101,7 @@ function PMA_buildHtmlForDb( foreach ($column_order as $stat_name => $stat) { if (array_key_exists($stat_name, $current)) { + $unit = ''; if (is_numeric($stat['footer'])) { $column_order[$stat_name]['footer'] += $current[$stat_name]; } @@ -132,6 +131,7 @@ function PMA_buildHtmlForDb( } } } + foreach ($replication_types as $type) { if ($replication_info[$type]['status']) { $out .= '<td class="tool" style="text-align: center;">'; @@ -140,15 +140,16 @@ function PMA_buildHtmlForDb( $current["SCHEMA_NAME"], $replication_info[$type]['Ignore_DB'] ); - if (strlen($key) > 0) { + if (/*overload*/mb_strlen($key) > 0) { $out .= PMA_Util::getIcon('s_cancel.png', __('Not replicated')); } else { $key = array_search( $current["SCHEMA_NAME"], $replication_info[$type]['Do_DB'] ); - if (strlen($key) > 0 - || ($replication_info[$type]['Do_DB'][0] == "" + if (/*overload*/mb_strlen($key) > 0 + || (isset($replication_info[$type]['Do_DB'][0]) + && $replication_info[$type]['Do_DB'][0] == "" && count($replication_info[$type]['Do_DB']) == 1) ) { // if ($key != null) did not work for index "0" @@ -165,7 +166,7 @@ function PMA_buildHtmlForDb( . '<a onclick="' . 'PMA_commonActions.setDb(\'' . PMA_jsFormat($current['SCHEMA_NAME']) . '\');' - . '" href="server_privileges.php?' . $url_query + . '" href="server_privileges.php' . $url_query . '&db=' . urlencode($current['SCHEMA_NAME']) . '&checkprivsdb=' . urlencode($current['SCHEMA_NAME']) . '" title="' |