bug #2787162 [interface] Table with name log_views is incorrectly dis…

…played as a view
phpmyadmin · May 6, 2009 · b5046cd · b5046cd
1 parent ecb07f5
commit b5046cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [calendar] js error "window.parent.addEvent is not a function" 
 - patch #2773818 [export] Invalid "Content-Encoding" header,
   thanks to abignale - abignale
+- bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view
 
 3.1.4.0 (2009-04-25)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -245,8 +245,10 @@ static protected function _isView($db, $table)
         // from 5.0.13 returns 'VIEW'.
         // use substr() because the comment might contain something like:
         // (VIEW 'BASE2.VTEST' REFERENCES INVALID TABLE(S) OR COLUMN(S) OR FUNCTION)
+        // use 'Engine' == NULL to exclude regular tables where the comment starts with the word 'view'
         $comment = strtoupper(PMA_Table::sGetStatusInfo($db, $table, 'Comment'));
-        return substr($comment, 0, 4) == 'VIEW';
+        $engine = PMA_Table::sGetStatusInfo($db, $table, 'Engine');
+        return ( substr($comment, 0, 4) == 'VIEW' && $engine == NULL);
     }
 
     static public function sGetToolTip($db, $table)