The branch, QA_3_3 has been updated
via a78fc120480240f8bbd7492b250215530978c396 (commit)
from a4ca1638e95cb7892c878394440a103d015be6fa (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
libraries/Table.class.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index de2cfe2..ceed355 100644
--- 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)) {
hooks/post-receive
--
phpMyAdmin