nettika/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-04-14 04:40:09 +02:00
parent c9a5f70acf e13f033d95
commit 3c8b3af512
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/sql.js
View File

@@ -930,10 +930,9 @@ $(document).ready(function() {
}
// remove possible previous feedback message
$('#result_query').remove();
if (typeof data.result_query != 'undefined') {
if (typeof data.sql_query != 'undefined') {
// display feedback
$('#sqlqueryresults').prepend('<div id="result_query" align="left"></div>');
$('#result_query').prepend(data.result_query);
$('#sqlqueryresults').prepend(data.sql_query);
}
PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, data, disp_mode);
} else {

2
sql.php
View File

@@ -63,7 +63,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value
$column = $_REQUEST['column'];
$foreigners = PMA_getForeigners($db, $table, $column);
$display_field = PMA_getDisplayField($foreigners[$column][foreign_db], $foreigners[$column][foreign_table]);
$display_field = PMA_getDisplayField($foreigners[$column]['foreign_db'], $foreigners[$column]['foreign_table']);
$foreignData = PMA_getForeignData($foreigners, $column, false, '', '');