[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20504-g8672278

Marc Delisle lem9 at users.sourceforge.net
Thu Sep 29 12:19:38 CEST 2011


The branch, master has been updated
       via  86722781ebeb5f740c778ec22c72015d9d63a414 (commit)
      from  0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c (commit)


- Log -----------------------------------------------------------------
commit 86722781ebeb5f740c778ec22c72015d9d63a414
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Sep 29 06:19:03 2011 -0400

    A table has been dropped from outside phpMyAdmin

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

Summary of changes:
 libraries/schema/User_Schema.class.php |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index ae0a629..29b1bf3 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -526,8 +526,12 @@ class PMA_User_Schema
             echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>';
             if (isset($with_field_names)) {
                 $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']);
-                foreach ($fields as $row) {
-                    echo '<br />' . htmlspecialchars($row['Field']) . "\n";
+                // if the table has been dropped from outside phpMyAdmin,
+                // we can no longer obtain its columns list
+                if ($fields) {
+                    foreach ($fields as $row) {
+                        echo '<br />' . htmlspecialchars($row['Field']) . "\n";
+                    }
                 }
             }
             echo '</div>' . "\n";


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list