The branch, master has been updated
via 5272fd6dab525808958feaf5a275addc23b7dda7 (commit)
from 98df129296c83ebe51e7c484c7d57ee31f19e115 (commit)
- Log -----------------------------------------------------------------
commit 5272fd6dab525808958feaf5a275addc23b7dda7
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Sun Feb 6 10:14:48 2011 +0530
Bug #3153832 - Untracked tables display problem with LeftFrameTableSeparator
-----------------------------------------------------------------------
Summary of changes:
db_tracking.php | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/db_tracking.php b/db_tracking.php
index d9a7da3..dbd5c5f 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -31,7 +31,7 @@ if (isset($_REQUEST['delete_tracking']) &&
isset($_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
*/
if($GLOBALS['is_ajax_request'] == true) {
@@ -149,13 +149,29 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) {
<?php
}
+$sep = $GLOBALS['cfg']['LeftFrameTableSeparator'];
+
// Get list of tables
$table_list = PMA_getTableList($GLOBALS['db']);
// For each table try to get the tracking version
foreach ($table_list as $key => $value) {
- if (PMA_Tracker::getVersion($GLOBALS['db'], $value['Name']) == -1) {
- $my_tables[] = $value['Name'];
+ // If $value is a table group.
+ 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'];
+ }
}
}
hooks/post-receive
--
phpMyAdmin
Show replies by date