The branch, master has been updated
via 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit)
via bd8126735f5dce0e894f2e7e549a6322f30936ca (commit)
from 66282adec9a900d98afa910f78d97352c75d300a (commit)
- Log -----------------------------------------------------------------
commit 82a1d451d1fad0164b4efde5b89a7f4f989b18ba
Merge: bd8126735f5dce0e894f2e7e549a6322f30936ca
66282adec9a900d98afa910f78d97352c75d300a
Author: Madhura Jayaratne <[email protected]>
Date: Fri Feb 18 00:36:15 2011 +0530
Merge branch 'master' of
ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit bd8126735f5dce0e894f2e7e549a6322f30936ca
Author: Madhura Jayaratne <[email protected]>
Date: Fri Feb 18 00:34:19 2011 +0530
Inline edit fails for foreign keys.
-----------------------------------------------------------------------
Summary of changes:
sql.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sql.php b/sql.php
index 0232620..3655d87 100644
--- a/sql.php
+++ b/sql.php
@@ -65,9 +65,7 @@ if (isset($_REQUEST['get_relational_values']) &&
$_REQUEST['get_relational_value
$foreignData = PMA_getForeignData($foreigners, $column, false, '', '');
- $dropdown = PMA_foreignDropdown($foreignData['disp_row'],
$foreignData['foreign_field'], $foreignData['foreign_display'],
$_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']);
-
- if( $dropdown == '<option value=""> </option>'."\n" ) {
+ if ($foreignData['disp_row'] == null) {
//Handle the case when number of values is more than
$cfg['ForeignKeyMaxLimit']
$_url_params = array(
'db' => $db,
@@ -80,6 +78,7 @@ if (isset($_REQUEST['get_relational_values']) &&
$_REQUEST['get_relational_value
.'>' . __('Browse foreign values') . '</a>';
}
else {
+ $dropdown = PMA_foreignDropdown($foreignData['disp_row'],
$foreignData['foreign_field'], $foreignData['foreign_display'],
$_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']);
$dropdown = '<select>' . $dropdown . '</select>';
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
