diff --git a/ChangeLog b/ChangeLog
index c2d8c50e6..602fc5214 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-09 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_links.php: invalid js confirmation and operation feedback
+      when dropping a view
+
 2005-10-09 Michal Čihař  <michal@cihar.com>
     * libraries/display_export.lib.php, libraries/export/sql.php, lang/*,
       config.default.php: Add ability to limit maximal size of extended insert
diff --git a/tbl_properties_links.php b/tbl_properties_links.php
index fc9296bb1..2f448c110 100644
--- a/tbl_properties_links.php
+++ b/tbl_properties_links.php
@@ -73,9 +73,11 @@ $tabs['drop']['link'] = 'sql.php';
 $tabs['drop']['text'] = $strDrop;
 $tabs['drop']['args']['reload']     = 1;
 $tabs['drop']['args']['purge']      = 1;
-$tabs['drop']['args']['sql_query']  = 'DROP ' . ($tbl_is_view ? 'VIEW' : 'TABLE') . ' ' . PMA_backquote($table);
-$tabs['drop']['args']['zero_rows']  = sprintf($strTableHasBeenDropped, htmlspecialchars($table));
-$tabs['drop']['attr'] = 'onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"';
+$drop_command = 'DROP ' . ($tbl_is_view ? 'VIEW' : 'TABLE');
+$tabs['drop']['args']['sql_query']  = $drop_command . ' ' . PMA_backquote($table);
+$tabs['drop']['args']['zero_rows']  = sprintf(($tbl_is_view ? $strViewHasBeenDropped : $strTableHasBeenDropped), htmlspecialchars($table));
+$tabs['drop']['attr'] = 'onclick="return confirmLink(this, \'' . $drop_command . ' ' . PMA_jsFormat($table) . '\')"';
+unset($drop_command);
 $tabs['drop']['class'] = 'caution';
 
 if ($table_info_num_rows > 0 || $tbl_is_view) {