The branch, QA_3_4 has been updated
via 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit)
from 37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit)
- Log -----------------------------------------------------------------
commit 789ed0d3d122f2165365cb5285b52c9885e6bffe
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Sep 29 06:08:30 2011 -0400
A table has been dropped from outside phpMyAdmin
-----------------------------------------------------------------------
Summary of changes:
libraries/schema/User_Schema.class.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libraries/schema/User_Schema.class.php
b/libraries/schema/User_Schema.class.php
index cb42dde..17c2d39 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -491,10 +491,12 @@ class PMA_User_Schema
$local_query = 'SHOW FIELDS FROM '
. PMA_backquote($temp_sh_page['table_name'])
. ' FROM ' . PMA_backquote($db);
- $fields_rs = PMA_DBI_query($local_query);
+ $fields_rs = PMA_DBI_try_query($local_query);
unset($local_query);
- $fields_cnt = PMA_DBI_num_rows($fields_rs);
-
+ // the table has been dropped from outside phpMyAdmin
+ if (PMA_DBI_getError()) {
+ continue;
+ }
echo '<div id="table_' . $i . '"
class="pdflayout_table"><u>' . $temp_sh_page['table_name']
. '</u>';
if (isset($with_field_names)) {
while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
hooks/post-receive
--
phpMyAdmin