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:
Pootle server 2011-08-05 02:40:31 +02:00
commit 64cda6bcf8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/database_interface.lib.php
View File

@ -841,8 +841,8 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null)
'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS
FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table),
'Field', null, $link);
if (! is_array($fields) || count($fields) < 1) {
return false;
if (! is_array($fields) || count($fields) == 0) {
return null;
}
return $fields;
}

5
libraries/server_synchronize.lib.php
View File

@ -1378,13 +1378,12 @@ function PMA_get_column_values($database, $table, $column, $link = null)
*/
function PMA_get_table_indexes($database, $table, $link = null)
{
$indexes = PMA_DBI_fetch_result(
'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' . PMA_backquote($table),
null, null, $link);
if (! is_array($indexes) || count($indexes) < 1) {
return false;
if (!is_array($indexes) || count($indexes) == 0) {
return null;
}
return $indexes;
}

1
server_synchronize.php
View File

@ -210,6 +210,7 @@ if ((isset($_REQUEST['submit_connect']))) {
*/
PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $j, $row_count);
}
/**
* Storing all arrays in session for use when page is reloaded for each button press
*/

2
tbl_structure.php
View File

@ -123,7 +123,7 @@ foreach (PMA_Index::getFromTable($table, $db) as $index) {
unset($index, $columns, $column_name, $dummy);
// 3. Get fields
$fields = PMA_DBI_get_columns($db, $table, !PMA_DRIZZLE);
$fields = PMA_DBI_get_columns($db, $table, true);
$fields_cnt = count($fields);
// Get more complete field information