diff options
author | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-11-09 21:14:26 +0300 |
---|---|---|
committer | Hugues Peccatte <hugues.peccatte@gmail.com> | 2014-11-09 21:14:26 +0300 |
commit | 7a6085344369d2c716831e80135ef60bc894c5fa (patch) | |
tree | 8f81ab80758882a71b60fe02bd658adfd63b35bf /db_structure.php | |
parent | 49836e6e6f041be6388bdd827cfde28b8d53b27d (diff) |
Replace $replication_info by a global variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Diffstat (limited to 'db_structure.php')
-rw-r--r-- | db_structure.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/db_structure.php b/db_structure.php index d764cf2c90..70c69d94a6 100644 --- a/db_structure.php +++ b/db_structure.php @@ -67,7 +67,7 @@ if ($GLOBALS['is_ajax_request'] if (!PMA_DRIZZLE) { include_once 'libraries/replication.inc.php'; } else { - $replication_info['slave']['status'] = false; + $GLOBALS['replication_info']['slave']['status'] = false; } require_once 'libraries/bookmark.lib.php'; @@ -123,7 +123,9 @@ $response->addHTML( $response->addHTML(PMA_URL_getHiddenInputs($db)); $response->addHTML( - PMA_tableHeader($db_is_system_schema, $replication_info['slave']['status']) + PMA_tableHeader( + $db_is_system_schema, $GLOBALS['replication_info']['slave']['status'] + ) ); $i = $sum_entries = 0; @@ -256,12 +258,12 @@ foreach ($tables as $keyname => $current_table) { ); $response->addHTML( - PMA_tableHeader(false, $replication_info['slave']['status']) + PMA_tableHeader(false, $GLOBALS['replication_info']['slave']['status']) ); } list($do, $ignored) = PMA_getServerSlaveStatus( - $replication_info['slave']['status'], $truename + $GLOBALS['replication_info']['slave']['status'], $truename ); // Handle favorite table list. ----START---- $already_favorite = PMA_checkFavoriteTable($db, $current_table['TABLE_NAME']); @@ -284,7 +286,7 @@ foreach ($tables as $keyname => $current_table) { list($html_output, $odd_row, $approx_rows) = PMA_getHtmlForStructureTableRow( $i, $odd_row, $table_is_view, $current_table, - $browse_table_label, $tracking_icon, $replication_info['slave']['status'], + $browse_table_label, $tracking_icon, $GLOBALS['replication_info']['slave']['status'], $browse_table, $tbl_url_query, $search_table, $db_is_system_schema, $titles, $empty_table, $drop_query, $drop_message, $collation, $formatted_size, $unit, $overhead, @@ -301,7 +303,7 @@ foreach ($tables as $keyname => $current_table) { $response->addHTML('</tbody>'); $response->addHTML( PMA_getHtmlBodyForTableSummary( - $num_tables, $replication_info['slave']['status'], $db_is_system_schema, + $num_tables, $GLOBALS['replication_info']['slave']['status'], $db_is_system_schema, $sum_entries, $db_collation, $is_show_stats, $sum_size, $overhead_size, $create_time_all, $update_time_all, $check_time_all, isset($approx_rows) ? $approx_rows : false |