From 863badfdc285382d8344269a304a64eca630fb6d Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 21 Jun 2018 01:38:46 +0200 Subject: [PATCH 1/3] Patch - missed instance of 'Avoid passing extension to Util::getImage' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch for commit https://github.com/phpmyadmin/phpmyadmin/commit/bed6fb4ebdc5f83ed30fe3e83e380baf24ed2fa5 Fixes: #14390 Signed-off-by: William Desportes (cherry picked from commit ff4785cbf281d08fc44f0eb7a7643bd7f99a54c4) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Navigation/Navigation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index c4a297bee6..146860f6b1 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -233,8 +233,8 @@ class Navigation $html .= '' - . Util::getIcon('show.png', __('Show')) - . ''; + . Util::getIcon('show', __('Show')) + . ''; } $html .= ''; $first = false; From 93ec29933baa3fd0318167a1894b6273ee9136d4 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 21 Jun 2018 02:02:47 +0200 Subject: [PATCH 2/3] Fix - #14382 "Visualize GIS data" icon missing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #14382 Signed-off-by: William Desportes (cherry picked from commit b3379d77001dbb8a49a9ceaf7bfd5544fa7b3cbc) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Display/Results.php | 4 +++- themes/pmahomme/css/icons.css.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 84c8c3f7d9..2d815eff8e 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -5019,7 +5019,9 @@ class Results 'tbl_gis_visualization.php' . Url::getCommon($_url_params), Util::getIcon( - 'b_globe.gif', __('Visualize GIS data'), true + 'b_globe', + __('Visualize GIS data'), + true ) ) . "\n"; diff --git a/themes/pmahomme/css/icons.css.php b/themes/pmahomme/css/icons.css.php index 04788ef91a..ae615d0bd9 100644 --- a/themes/pmahomme/css/icons.css.php +++ b/themes/pmahomme/css/icons.css.php @@ -44,6 +44,7 @@ if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) { .ic_b_find_replace { background-image: url('getImgPath('b_find_replace.png'); ?>'); } .ic_b_firstpage { background-image: url('getImgPath('b_firstpage.png'); ?>'); } .ic_b_ftext { background-image: url('getImgPath('b_ftext.png'); ?>'); } +.ic_b_globe { background-image: url('getImgPath('b_globe.gif'); ?>'); } .ic_b_group { background-image: url('getImgPath('b_group.png'); ?>'); } .ic_b_help { background-image: url('getImgPath('b_help.png'); ?>'); } .ic_b_home { background-image: url('getImgPath('b_home.png'); ?>'); } From 865f16a7f6dd373e73b1eff8d39b8edcfdc6a395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 4 Jul 2018 20:44:01 -0300 Subject: [PATCH 3/3] Add ChangeLog entries for #14390 and #14382 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index da665f8d74..8f65a02f05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ phpMyAdmin - ChangeLog - issue #14327 Fix Editing server variable not showing save or cancel option - issue #14377 Populate options for view create and edit - issue #14171 2FA configuration fails if PHP doesn't have GD support +- issue #14390 Can't unhide tables +- issue #14382 "Visualize GIS data" icon missing 4.8.2 (2018-06-21) - issue #14370 WHERE 0 causes Fatal error