Merge remote-tracking branch 'origin/master'

phpmyadmin · Aug 13, 2017 · db94ea1 · db94ea1
2 parents 7452b23 + 541525c
commit db94ea1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog
 - issue #13550 Fixed copy results to clipboard
 - issue #13562 Add limitation for user group length
 - issue #13561 Fixed edit variable link in advisor
+- issue #13579 Optimize table link should not be visible in print page
 
 4.7.3 (2017-07-20)
 - issue #13447 Large multi-line query removes Export operation and blanks query box options

diff --git a/templates/table/structure/display_table_stats.twig b/templates/table/structure/display_table_stats.twig
@@ -54,7 +54,7 @@
                     or tbl_storage_engine == 'ARIA'
                     or tbl_storage_engine == 'MARIA'
                     or tbl_storage_engine == 'BDB') %}
-                    <tr class="tblFooters">
+                    <tr class="tblFooters print_ignore">
                         <td colspan="3" class="center">
                             <a href="sql.php{{ url_query }}&amp;pos=0&amp;sql_query=
                                 {{- ('OPTIMIZE TABLE ' ~ Util_backquote(table))|url_encode }}">