From 7dff09dcf23bdef4e8e6c4f82f629ad7f50ff589 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 15 Oct 2006 00:48:51 +0000
Subject: [PATCH] bug #1567316, renaming a db containing a view

---
 ChangeLog                 | 4 ++++
 libraries/Table.class.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1e2fcc68d..ac7295c4d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-10-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/Table.class.php: bug #1567316, renaming a db containing view
+      (but still some work to ensure proper sequence of renaming)
+
 2006-10-13 Marc Delisle  <lem9@users.sourceforge.net>
     * css/phpmyadmin.css.php: bug #1517428, some IE 6 versions have
       problems loading CSS when zlip.output_compression is on,
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 1a5af8a14..6fc9e60f7 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -667,7 +667,7 @@ class PMA_Table {
             // moving table from replicated one to not replicated one
             PMA_DBI_select_db($source_db);
 
-            if (PMA_Table::_isView($source_db,$source)) {
+            if (PMA_Table::_isView($source_db,$source_table)) {
                 $sql_drop_query = 'DROP VIEW';
             } else {
                 $sql_drop_query = 'DROP TABLE';