[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-9-g5289db8

[Madhura Jayaratne]

The branch, QA_3_5 has been updated
       via  5289db8dd474bc33af3bcf20688c6d0d4359eb0a (commit)
       via  426a7e3733e12ef225a96e25d4d5554665d6cf52 (commit)
       via  badc93d5d4eb2dcd02f6898e13977dafe11425db (commit)
      from  16b0e8a9ed30596f58815e8337f41982393c7c39 (commit)


- Log -----------------------------------------------------------------
commit 5289db8dd474bc33af3bcf20688c6d0d4359eb0a
Merge: 16b0e8a 426a7e3
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Wed Jan 25 23:30:48 2012 +0530

    Merge branch 'QA_3_4' into QA_3_5
    
    Conflicts:
    	ChangeLog
    	Documentation.html
    	README
    	libraries/Config.class.php

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

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
-- 
phpMyAdmin