Merge branch 'QA_3_3'

This commit is contained in:
Michal Čihař
2010-03-30 13:27:16 +02:00

View File

@@ -248,7 +248,7 @@ class PMA_Table
* @return boolean true if it is a merge table * @return boolean true if it is a merge table
* @access public * @access public
*/ */
public function isMerge($db = null, $table = null) static public function isMerge($db = null, $table = null)
{ {
// if called static, with parameters // if called static, with parameters
if (! empty($db) && ! empty($table)) { if (! empty($db) && ! empty($table)) {