bug #4104 Can't edit updatable view when searching

phpmyadmin · Oct 5, 2013 · 111923f · 111923f
1 parent c693975
commit 111923f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.0.9.0 (not yet released)
+- bug #4104 Can't edit updatable view when searching
 
 4.0.8.0 (not yet released)
 - bug #3988 Rename view is not working

diff --git a/sql.php b/sql.php
@@ -1237,10 +1237,9 @@
     // hide edit and delete links:
     // - for information_schema
     // - if the result set does not contain all the columns of a unique key
-    //   and we are not just browing all the columns of an updatable view
+    //   (unless this is an updatable view)
     $updatableView
-        = $justBrowsing
-        && trim($analyzed_sql[0]['select_expr_clause']) == '*'
+        = trim($analyzed_sql[0]['select_expr_clause']) == '*'
         && PMA_Table::isUpdatableView($db, $table);
     $editable = $resultSetContainsUniqueKey || $updatableView;
     if (!empty($table) && (PMA_is_system_schema($db) || !$editable)) {