From 33aec2c76434717421d9070f537561c678b4d36e Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 18 Jan 2011 17:29:40 +0100 Subject: [PATCH] Move from Adminer::backwardKeysPrint --- adminer/select.inc.php | 3 +++ editor/include/adminer.inc.php | 27 ++++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 09938950..0b4e40d0 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -358,6 +358,9 @@ if (!$columns) { ); } } + if ($backward_keys) { + echo ""; + } $adminer->backwardKeysPrint($backward_keys, $rows[$n]); echo "\n"; // close to allow white-space: pre } diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index c8db6b58..6d99494f 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -93,22 +93,19 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5 } function backwardKeysPrint($backwardKeys, $row) { - if ($backwardKeys) { - echo ""; - foreach ($backwardKeys as $table => $backwardKey) { - foreach ($backwardKey["keys"] as $cols) { - $link = ME . 'select=' . urlencode($table); - $i = 0; - foreach ($cols as $column => $val) { - $link .= where_link($i++, $column, $row[$val]); - } - echo "" . h($backwardKey["name"]) . ""; - $link = ME . 'edit=' . urlencode($table); - foreach ($cols as $column => $val) { - $link .= "&set" . urlencode("[" . bracket_escape($column) . "]") . "=" . urlencode($row[$val]); - } - echo "+ "; + foreach ($backwardKeys as $table => $backwardKey) { + foreach ($backwardKey["keys"] as $cols) { + $link = ME . 'select=' . urlencode($table); + $i = 0; + foreach ($cols as $column => $val) { + $link .= where_link($i++, $column, $row[$val]); } + echo "" . h($backwardKey["name"]) . ""; + $link = ME . 'edit=' . urlencode($table); + foreach ($cols as $column => $val) { + $link .= "&set" . urlencode("[" . bracket_escape($column) . "]") . "=" . urlencode($row[$val]); + } + echo "+ "; } } }