[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-915-g968f1f9
Michal Čihař
nijel at users.sourceforge.net
Tue Mar 30 13:27:32 CEST 2010
The branch, master has been updated
via 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b (commit)
via a78fc120480240f8bbd7492b250215530978c396 (commit)
from a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 (commit)
- Log -----------------------------------------------------------------
commit 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b
Merge: a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 a78fc120480240f8bbd7492b250215530978c396
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Mar 30 13:27:16 2010 +0200
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
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 9e80660..81184a9 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
More information about the Git
mailing list