The branch, master has been updated
via 958fcf97f43984ac6f7be07b24a2eec9bf68f252 (commit)
via 047cb6845fb1a7cbd4e8adf4d68cfc46eec7804f (commit)
from bd2d817b0634172ead4072c46f663d08b7bf8081 (commit)
- Log -----------------------------------------------------------------
commit 958fcf97f43984ac6f7be07b24a2eec9bf68f252
Merge: bd2d817 047cb68
Author: Marc Delisle <[email protected]>
Date: Mon Aug 22 06:27:33 2011 -0400
Merge commit '047cb6845fb1a7cbd4e8adf4d68cfc46eec7804f'
commit 047cb6845fb1a7cbd4e8adf4d68cfc46eec7804f
Author: Ammar Yasir <[email protected]>
Date: Sun Aug 21 23:04:13 2011 +0530
Fixed: Not selecting a datalabel used to issue a notice(undefined offset)
-----------------------------------------------------------------------
Summary of changes:
tbl_zoom_select.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index a565768..2352fc1 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -369,8 +369,10 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' &&
$inputs[1] != 'pma_null' &
$row['where_clause'] = $uniqueCondition[0];
if($dataLabel == $inputs[0] || $dataLabel == $inputs[1])
$data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] =>
$row[$inputs[1]], 'where_clause' => $uniqueCondition[0]);
- else
+ else if($dataLabel)
$data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] =>
$row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' =>
$uniqueCondition[0]);
+ else
+ $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] =>
$row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]);
}
?>
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
