Merge branch 'QA_3_3'

2010-03-30 13:27:16 +02:00
parent a5c73c5a9a a78fc12048
commit 968f1f9d2d
1 changed files with 1 additions and 1 deletions
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -248,7 +248,7 @@ class PMA_Table
     * @return  boolean  true if it is a merge table 
     * @access  public
     */
-    public function isMerge($db = null, $table = null)
+    static public function isMerge($db = null, $table = null)
    {
        // if called static, with parameters
        if (! empty($db) && ! empty($table)) {