gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-04-17 23:06:24 +02:00
commit 97357ba3b0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/export/xml.php
View File

@ -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);

2
libraries/import.lib.php
View File

@ -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 */

2
libraries/plugin_interface.lib.php
View File

@ -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;
}
}
}