From 319e259b10137fffc6645879acd5443cd7443c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 3 Oct 2017 14:00:46 +0200 Subject: [PATCH] Revert "ChangeLog entry for #12167 and #13702" This reverts commit 4f7c08e8ecf88ba6690eaa04872f1479ef81032b. --- ChangeLog | 1 - libraries/classes/Display/Results.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd2d95638f..e0869a4c2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,7 +36,6 @@ phpMyAdmin - ChangeLog - issue #13576 Add privileges export to per database listing - issue Consolidate functions into class files - issue #13560 Add support for changing collation for all tables and columns in database -- issue #12167 Fix action column position - issue #13303 Add support for creating fulltext index from table structure 4.7.5 (not yet released) diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index de86875573..b9f71daafb 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -1527,6 +1527,7 @@ class Results $display_params = $this->__get('display_params'); // 1. Displays the full/partial text button (part 1)... + // $button_html .= '' . "\n"; $colspan = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE) && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))