From c6db1f9a5073f1bb7a775c64f1fa5bd90f22dc72 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Sun, 13 Aug 2017 06:23:31 +0530
Subject: [PATCH 1/3] Optimize table link should not be visible in print page

Fix #13579

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 templates/table/structure/display_table_stats.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/table/structure/display_table_stats.phtml b/templates/table/structure/display_table_stats.phtml
index 245aa0a87d..e8e8710999 100644
--- a/templates/table/structure/display_table_stats.phtml
+++ b/templates/table/structure/display_table_stats.phtml
@@ -53,7 +53,7 @@
                             || $tbl_storage_engine == 'ARIA'
                             || $tbl_storage_engine == 'MARIA'
                             || $tbl_storage_engine == 'BDB')): ?>
-                    <tr class="tblFooters">
+                    <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'])); ?>">

From 3c4ec46b0e0b5d8fb651f88d601b7dc09b621565 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Sun, 13 Aug 2017 06:24:48 +0530
Subject: [PATCH 2/3] ChangeLog for #13579

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 88794a4759..d890873893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,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

From 541525cf41b556c12f3d33c28935fe4962a4c220 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Sun, 13 Aug 2017 06:30:04 +0530
Subject: [PATCH 3/3] Remove unnecessarily file, added in merge

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 .../table/structure/display_table_stats.phtml | 80 -------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 templates/table/structure/display_table_stats.phtml

diff --git a/templates/table/structure/display_table_stats.phtml b/templates/table/structure/display_table_stats.phtml
deleted file mode 100644
index e8e8710999..0000000000
--- a/templates/table/structure/display_table_stats.phtml
+++ /dev/null
@@ -1,80 +0,0 @@
-<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>