The branch, master has been updated via a822895df6892e8a91653fba75cbe6898c041396 (commit) from 6a6b844525a782b148f235a11b77712e1d256280 (commit)
- Log ----------------------------------------------------------------- commit a822895df6892e8a91653fba75cbe6898c041396 Author: Marc Delisle marc@infomarc.info Date: Mon Dec 12 12:44:12 2011 -0500
bug #3455021 Fatal error: Cannot redeclare PMA_extract_db_or_table()
-----------------------------------------------------------------------
Summary of changes: db_create.php | 2 +- db_structure.php | 2 +- server_databases.php | 2 +- server_status.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/db_create.php b/db_create.php index 2402705..2bebe0e 100644 --- a/db_create.php +++ b/db_create.php @@ -14,7 +14,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
require_once './libraries/mysql_charsets.lib.php'; if (!PMA_DRIZZLE) { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; } require './libraries/build_html_for_db.lib.php';
diff --git a/db_structure.php b/db_structure.php index 3baad46..9120f9b 100644 --- a/db_structure.php +++ b/db_structure.php @@ -47,7 +47,7 @@ if (empty($is_info)) { include './libraries/db_info.inc.php';
if (!PMA_DRIZZLE) { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; } else { $server_slave_status = false; } diff --git a/server_databases.php b/server_databases.php index 0b01f4c..ddab0d4 100644 --- a/server_databases.php +++ b/server_databases.php @@ -12,7 +12,7 @@ require_once './libraries/common.inc.php';
require './libraries/server_common.inc.php'; if (!PMA_DRIZZLE) { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; } else { $replication_types = array(); $replication_info = null; diff --git a/server_status.php b/server_status.php index 6037038..3a891ba 100644 --- a/server_status.php +++ b/server_status.php @@ -407,7 +407,7 @@ if (PMA_DRIZZLE) { $server_master_status = false; $server_slave_status = false; } else { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; include_once './libraries/replication_gui.lib.php'; }
hooks/post-receive