The branch, master has been updated
via 0eb8f28a0675cbac494629c9b117b096bb2169c0 (commit)
via 4f4ab7dc6951ad3537c9e3578cf0601effa4c688 (commit)
from a62aa22ad5dfe90191f9186dcf3bd7c18c2a021a (commit)
- Log -----------------------------------------------------------------
commit 0eb8f28a0675cbac494629c9b117b096bb2169c0
Merge: a62aa22 4f4ab7d
Author: Marc Delisle <[email protected]>
Date: Sun Aug 21 07:32:39 2011 -0400
Merge commit '4f4ab7dc6951ad3537c9e3578cf0601effa4c688'
commit 4f4ab7dc6951ad3537c9e3578cf0601effa4c688
Author: Ammar Yasir <[email protected]>
Date: Sun Aug 21 10:47:20 2011 +0530
Fixed: 'Browse foreign values' not working properly
-----------------------------------------------------------------------
Summary of changes:
libraries/tbl_select.lib.php | 4 ++--
tbl_zoom_select.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 755322e..07c5883 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -179,12 +179,12 @@ function PMA_getForeignFields_Values($foreigners,
$foreignData, $field, $tbl_fie
} elseif ($foreignData['foreign_link'] == true) {
if(isset($fields[$i]) && is_string($fields[$i])){
- $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i
. '] " value="' . $fields[$i] . '"';
+ $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i
. ']" value="' . $fields[$i] . '"';
'id="field_' . md5($field) . '[' . $i .']"
class="textfield"/>' ;
}
else{
- $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i
. '] "';
+ $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i
. ']"';
'id="field_' . md5($field) . '[' . $i .']"
class="textfield" />' ;
}
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 518121d..a565768 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -127,7 +127,7 @@ if(isset($inputs) && ($inputs[0] != 'pma_null' ||
$inputs[1] != 'pma_null'))
*/
?>
-<form method="post" action="tbl_zoom_select.php" name="zoomInputForm"
id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? '
class="ajax"' : ''); ?>>
+<form method="post" action="tbl_zoom_select.php" name="insertForm"
id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? '
class="ajax"' : ''); ?>>
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="hidden" name="back" value="tbl_zoom_select.php" />
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
