Merge branch 'QA_4_7'

2017-02-19 09:21:50 -05:00 · 2017-02-19 09:21:50 -05:00 · 8eab9941da
commit 8eab9941da
parent f09f53e852 2f7dd1e149
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -80,6 +80,7 @@ phpMyAdmin - ChangeLog
 - issue #12958 Always show error reporting dialog on top
 - issue #12693 Improved support for TokuDB
 - issue #11231 Try harder to honor LoginCookieValidity setting
+- issue #13016 and #13017 Slight improvements to the table layout of Relation view

 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@ -61,7 +61,7 @@
                    )
                ); ?>
                <tr>
-                    <td colspan="5">
+                    <th colspan="6">
                        <a class="formelement clearfloat add_foreign_key" href="">
                            <?= __('+ Add constraint'); ?>
                    </td>