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

correct function call

Browse Source
This commit is contained in:
Marc Delisle
2006-04-13 08:01:35 +00:00
parent 61c509d559
commit 2cba19241c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
export.php
View File

@@ -436,7 +436,7 @@ if ($export_type == 'server') {
break 3; break 3;
} }
} }
if (isset($GLOBALS[$what . '_data']) && ! PMA_tableIsView($current_db, $table)) { if (isset($GLOBALS[$what . '_data']) && ! PMA_table::isView($current_db, $table)) {
if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) {
break 3; break 3;
} }
@@ -457,7 +457,14 @@ if ($export_type == 'server') {
$tmp_select = '|' . $tmp_select . '|'; $tmp_select = '|' . $tmp_select . '|';
} }
$i = 0; $i = 0;
//$view = array();
foreach ($tables as $table) { foreach ($tables as $table) {
// if this is a view, collect it for later; views must be exported after
// the tables
//if (PMA_Table::isView($db, $table)) {
// $views[] = $table;
// continue;
//}
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|')) if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|'))
|| !isset($tmp_select)) { || !isset($tmp_select)) {
@@ -467,7 +474,7 @@ if ($export_type == 'server') {
break 2; break 2;
} }
} }
if (isset($GLOBALS[$what . '_data']) && ! PMA_tableIsView($db, $table)) { if (isset($GLOBALS[$what . '_data']) && ! PMA_table::isView($db, $table)) {
if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
break 2; break 2;
} }
@@ -508,7 +515,7 @@ if ($export_type == 'server') {
break; break;
} }
} }
if (isset($GLOBALS[$what . '_data']) && ! PMA_tableIsView($db, $table)) { if (isset($GLOBALS[$what . '_data']) && ! PMA_table::isView($db, $table)) {
if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) {
break; break;
} }