From db5f9a9f513c64b3e4fd042fa17dbee4a9c8acdd Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Mon, 16 Apr 2012 12:25:05 +0300 Subject: [PATCH 1/3] fix original column names in export xml Inside the column names contained spaces, but in the tags, they were replaced with underscores, causing a mismatch. --- libraries/export/xml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/export/xml.php b/libraries/export/xml.php index bc877d55c7..018dce1551 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -353,7 +353,7 @@ if (isset($plugin_list)) { $columns_cnt = PMA_DBI_num_fields($result); $columns = array(); for ($i = 0; $i < $columns_cnt; $i++) { - $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i))); + $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i)); } unset($i); From e13706fd3ec3666ce6afa6e722b7c02e318c26bc Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Mon, 16 Apr 2012 12:34:53 +0300 Subject: [PATCH 2/3] fix replace statements for tables containing TABLE in their names --- libraries/import.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 7fa813d31c..e25a2b4056 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -940,7 +940,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = * * $pattern = 'CREATE (TABLE|VIEW|TRIGGER|FUNCTION|PROCEDURE)'; */ - $pattern = '/CREATE .*(TABLE)/'; + $pattern = '/CREATE [^`]*(TABLE)/'; $replacement = 'CREATE \\1 IF NOT EXISTS'; /* Change CREATE statements to CREATE IF NOT EXISTS to support inserting into existing structures */ From 6a7560d9c9dbd4193fb2ecf43142a4d10052394c Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Mon, 16 Apr 2012 12:43:35 +0300 Subject: [PATCH 3/3] include import and export plugins only once --- libraries/plugin_interface.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index e323d9f638..7388c33c8e 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -26,7 +26,7 @@ function PMA_getPlugins($plugins_dir, $plugin_param) // matches a file which does not start with a dot but ends // with ".php" if (is_file($plugins_dir . $file) && preg_match('@^[^\.](.)*\.php$@i', $file)) { - include $plugins_dir . $file; + include_once $plugins_dir . $file; } } }