Move <td> from Adminer::backwardKeysPrint

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 099389503010ad154a612fab628f695735360e2b..0b4e40d0b646b3580861d48554df47164fbb95f5 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -358,6 +358,9 @@ if (!$columns) {
                                                );
                                        }
                                }
+                               if ($backward_keys) {
+                                       echo "<td>";
+                               }
                                $adminer->backwardKeysPrint($backward_keys, $rows[$n]);
                                echo "</tr>\n"; // close to allow white-space: pre
                        }

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index c8db6b584313dcbc8c986f017a8da8081dcd4626..6d99494fdd45198fd0e58fb49c9be5975092b225 100644 (file)
--- 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 "<td>";
-                       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 "<a href='" . h($link) . "'>" . h($backwardKey["name"]) . "</a>";
-                                       $link = ME . 'edit=' . urlencode($table);
-                                       foreach ($cols as $column => $val) {
-                                               $link .= "&set" . urlencode("[" . bracket_escape($column) . "]") . "=" . urlencode($row[$val]);
-                                       }
-                                       echo "<a href='" . h($link) . "' title='" . lang('New item') . "'>+</a> ";
+               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 "<a href='" . h($link) . "'>" . h($backwardKey["name"]) . "</a>";
+                               $link = ME . 'edit=' . urlencode($table);
+                               foreach ($cols as $column => $val) {
+                                       $link .= "&set" . urlencode("[" . bracket_escape($column) . "]") . "=" . urlencode($row[$val]);
                                }
+                               echo "<a href='" . h($link) . "' title='" . lang('New item') . "'>+</a> ";
                        }
                }
        }