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

Bug #3153832 - Untracked tables display problem with LeftFrameTableSeparator

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-02-06 10:14:48 +05:30
parent 98df129296
commit 5272fd6dab
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
db_tracking.php
View File

@@ -31,7 +31,7 @@ if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
PMA_Tracker::deleteTracking($GLOBALS['db'], $_REQUEST['table']); PMA_Tracker::deleteTracking($GLOBALS['db'], $_REQUEST['table']);
/** /**
* If in an Ajax request, generate the success message and use * If in an Ajax request, generate the success message and use
* {@link PMA_ajaxResponse()} to send the output * {@link PMA_ajaxResponse()} to send the output
*/ */
if($GLOBALS['is_ajax_request'] == true) { if($GLOBALS['is_ajax_request'] == true) {
@@ -149,13 +149,29 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) {
<?php <?php
} }
$sep = $GLOBALS['cfg']['LeftFrameTableSeparator'];
// Get list of tables // Get list of tables
$table_list = PMA_getTableList($GLOBALS['db']); $table_list = PMA_getTableList($GLOBALS['db']);
// For each table try to get the tracking version // For each table try to get the tracking version
foreach ($table_list as $key => $value) { foreach ($table_list as $key => $value) {
if (PMA_Tracker::getVersion($GLOBALS['db'], $value['Name']) == -1) { // If $value is a table group.
$my_tables[] = $value['Name']; if (array_key_exists(('is' . $sep . 'group'), $value) && $value['is' . $sep . 'group']) {
foreach ($value as $temp_table) {
// If $temp_table is a table with the value for 'Name' is set,
// rather than a propery of the table group.
if (array_key_exists('Name', $temp_table)) {
if (PMA_Tracker::getVersion($GLOBALS['db'], $temp_table['Name']) == -1) {
$my_tables[] = $temp_table['Name'];
}
}
}
// If $value is a table.
} else {
if (PMA_Tracker::getVersion($GLOBALS['db'], $value['Name']) == -1) {
$my_tables[] = $value['Name'];
}
} }
} }