The branch, master has been updated via 112d692a3f7bfa69c9d2c7d8e68ec06f3aafa006 (commit) via 426a7e3733e12ef225a96e25d4d5554665d6cf52 (commit) from f196b4804d8e96386a822e68927e2103956a868f (commit)

- Log ----------------------------------------------------------------- commit 112d692a3f7bfa69c9d2c7d8e68ec06f3aafa006 Merge: f196b48 426a7e3 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Wed Jan 25 23:12:22 2012 +0530

Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes: db_tracking.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/db_tracking.php b/db_tracking.php index a448647..6fd9a9c 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -163,7 +163,7 @@ foreach ($table_list as $key => $value) { 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 (is_array($temp_table) && array_key_exists('Name', $temp_table)) { if (PMA_Tracker::getVersion($GLOBALS['db'], $temp_table['Name']) == -1) { $my_tables[] = $temp_table['Name']; }

hooks/post-receive