Fix merge conflicts

ChangeLog

@@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog
 - bug #3518983 [designer] Error messages do not appear in the Designer
 - bug #3519747 [interface] Suhosin patch warning incorrectly displayed
 - bug #3520107 [interface] Server status page: Incorrect dialog box titles
+- bug #3516089 [structure] DROP does not work on defective VIEWs
 
 3.5.0.0 (2012-04-07)
 + rfe #2021981 [interface] Add support for mass prefix change.

db_structure.php

@@ -379,7 +379,7 @@ foreach ($tables as $keyname => $each_table) {
         }
 
         $drop_query = 'DROP '
-            . ($table_is_view ? 'VIEW' : 'TABLE')
+            . (($table_is_view || $each_table['ENGINE'] == null) ? 'VIEW' : 'TABLE')
             . ' ' . PMA_backquote($each_table['TABLE_NAME']);
         $drop_message = sprintf(
             $table_is_view ? __('View %s has been dropped') : __('Table %s has been dropped'),
@@ -480,7 +480,17 @@ foreach ($tables as $keyname => $each_table) {
             <?php echo $titles['Insert']; ?></a></td>
     <td class="center"><?php echo $empty_table; ?></td>
     <td class="center">
-    <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_table_anchor"' : ''); ?> href="sql.php?<?php echo $tbl_url_query;
+    <a 
+    <?php if ($GLOBALS['cfg']['AjaxEnable']) {
+            echo 'class="drop_table_anchor';
+            if ($table_is_view || $each_table['ENGINE'] == null) {
+                // this class is used in db_structure.js to display the
+                // correct confirmation message
+                echo ' view';
+            }
+            echo '"';
+          }
+    ?> href="sql.php?<?php echo $tbl_url_query;
             ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php
             echo urlencode($drop_query); ?>&amp;message_to_show=<?php
             echo urlencode($drop_message); ?>" >

js/db_structure.js

@@ -327,7 +327,7 @@ $(function() {
     }); //end of Truncate Table Ajax action
 
     /**
-     * Ajax Event handler for 'Drop Table'
+     * Ajax Event handler for 'Drop Table' or 'Drop View'
      *
      * @see     $cfg['AjaxEnable']
      */
@@ -348,7 +348,7 @@ $(function() {
         /**
          * @var is_view Boolean telling if we have a view
          */
-        var is_view = $curr_row.hasClass('is_view');
+        var is_view = $curr_row.hasClass('is_view') || $this_anchor.hasClass('view');
         /**
          * @var question    String containing the question to be asked for confirmation
          */