Merge branch 'QA_4_7'

Conflicts:
	templates/table/structure/display_table_stats.phtml

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

templates/table/structure/display_table_stats.phtml

@@ -0,0 +1,80 @@
+<div id="tablestatistics">
+    <fieldset>
+        <legend><?= __('Information'); ?></legend>
+        <?php if($showtable['TABLE_COMMENT'] !== '') { ?>
+            <p> <strong> <?= __('Table comments:') ?> </strong>
+                <?= htmlspecialchars($showtable['TABLE_COMMENT']) ;?>
+            </p>
+        <?php } ?>
+        <a id="showusage"></a>
+
+        <?php if (! $tbl_is_view && ! $db_is_system_schema): ?>
+            <table id="tablespaceusage" class="data">
+                <caption class="tblHeaders"><?= __('Space usage'); ?></caption>
+                <tbody>
+                    <tr>
+                        <th class="name"><?= __('Data'); ?></th>
+                        <td class="value"><?= $data_size; ?></td>
+                        <td class="unit"><?= $data_unit; ?></td>
+                    </tr>
+
+                <?php if (isset($index_size)): ?>
+                    <tr>
+                        <th class="name"><?= __('Index'); ?></th>
+                        <td class="value"><?= $index_size; ?></td>
+                        <td class="unit"><?= $index_unit; ?></td>
+                    </tr>
+                <?php endif; ?>
+
+                <?php if (isset($free_size)): ?>
+                    <tr>
+                        <th class="name"><?= __('Overhead'); ?></th>
+                        <td class="value"><?= $free_size; ?></td>
+                        <td class="unit"><?= $free_unit; ?></td>
+                    </tr>
+                    <tr>
+                        <th class="name"><?= __('Effective'); ?></th>
+                        <td class="value"><?= $effect_size; ?></td>
+                        <td class="unit"><?= $effect_unit; ?></td>
+                    </tr>
+                <?php endif; ?>
+
+                <?php if (isset($tot_size) && $mergetable == false): ?>
+                    <tr>
+                        <th class="name"><?= __('Total'); ?></th>
+                        <td class="value"><?= $tot_size; ?></td>
+                        <td class="unit"><?= $tot_unit; ?></td>
+                    </tr>
+                <?php endif; ?>
+
+                <!-- Optimize link if overhead -->
+                <?php if (isset($free_size)
+                            && ($tbl_storage_engine == 'MYISAM'
+                            || $tbl_storage_engine == 'ARIA'
+                            || $tbl_storage_engine == 'MARIA'
+                            || $tbl_storage_engine == 'BDB')): ?>
+                    <tr class="tblFooters print_ignore">
+                        <td colspan="3" class="center">
+                            <a href="sql.php<?= $url_query; ?>&pos=0&amp;sql_query=<?= urlencode(
+                                    'OPTIMIZE TABLE ' . PMA\libraries\Util::backquote($GLOBALS['table'])); ?>">
+                                <?= PMA\libraries\Util::getIcon('b_tbloptimize.png', __('Optimize table')); ?>
+                            </a>
+                        </td>
+                    </tr>
+                <?php endif; ?>
+                </tbody>
+            </table>
+        <?php endif; ?>
+        <?= PMA\libraries\Template::get('table/structure/row_stats_table')->render(
+              array(
+                  'showtable' => $showtable,
+                  'tbl_collation' => $tbl_collation,
+                  'is_innodb' => $is_innodb,
+                  'mergetable' => $mergetable,
+                  'avg_size' => (isset ($avg_size) ? $avg_size : ''),
+                  'avg_unit' => (isset ($avg_unit) ? $avg_unit : '')
+              )
+            )
+        ?>
+    </fieldset>
+</div>

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 }}">