From c34484a739fc88a6866d261245094982be791628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 30 Apr 2018 01:37:48 -0300 Subject: [PATCH 1/3] Fix TableCreateTest::testCreateTable Selenium test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth (cherry picked from commit e548d0802b05579c22d95aadd26ea9b0bba11fb6) Signed-off-by: Maurício Meneghini Fauth --- test/selenium/TableCreateTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/selenium/TableCreateTest.php b/test/selenium/TableCreateTest.php index ad3f62265a..17a893a490 100644 --- a/test/selenium/TableCreateTest.php +++ b/test/selenium/TableCreateTest.php @@ -54,8 +54,8 @@ class TableCreateTest extends TestBase $this->waitAjax(); $this->waitForElement('byName', 'do_save_data'); - $this->waitForElement('byId', "field_1_6")->click(); // null - $this->waitForElement('byId', "field_0_8")->click(); // auto increment + $this->waitForElement('byId', "field_1_7")->click(); // null + $this->waitForElement('byId', "field_0_9")->click(); // auto increment // Do this separately since this opens a dialog // Since auto-increment auto sets a PRIMARY key since no key present @@ -66,10 +66,10 @@ class TableCreateTest extends TestBase $column_text_details = array( "field_0_1" => "test_id", "field_0_3" => "14", - "field_0_9" => "comm1", + "field_0_10" => "comm1", "field_1_1" => "test_column", "field_1_3" => "10", - "field_1_9" => "comm2", + "field_1_10" => "comm2", ); foreach ($column_text_details as $field => $val) { @@ -77,7 +77,7 @@ class TableCreateTest extends TestBase } $column_dropdown_details = array( - "field_0_5" => "UNSIGNED", + "field_0_6" => "UNSIGNED", "field_1_2" => "VARCHAR", "field_1_5" => "utf8_general_ci", "field_1_4" => "As defined:" From b36c295c897f6b61fbf41a5a7ed98072391211af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 11 Apr 2018 19:15:22 -0300 Subject: [PATCH 2/3] Remove homebrew/php from Travis CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit homebrew/php was migrated to homebrew/core Signed-off-by: Maurício Meneghini Fauth (cherry picked from commit 86adefd460a6f3e7665f6507a933cd2ecd67aafe) Signed-off-by: Maurício Meneghini Fauth --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcdcc7fd99..8ed40373ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,6 @@ matrix: env: CI_MODE=test before_install: - brew update - - brew tap homebrew/php - brew install gettext php72 mariadb - brew link --force gettext - sed -i -e 's/^memory_limit = .*/memory_limit = -1/' /usr/local/etc/php/7.2/php.ini From e6cc4fbbbcea02d5eccb568de9a7dc7d88290934 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 8 May 2018 07:10:06 +1000 Subject: [PATCH 3/3] Fix #14264 Linking for 'Distinct values' broken Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/classes/Display/Results.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index df72c9e517..4e4d42820a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - issue #14212 XML Export from single table throws fatal error - issue #14239 Line and some other charts ignore result set order of values chosen for the x-axis - issue #14260 Fixed configuration for DefaultLang and Lang +- issue #14264 Linking for 'Distinct values' broken 4.8.0.1 (2018-04-19) - issue [security] Multiple CSRF vulnerabilities, See PMASA-2018-02 diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 80abaf9459..b97c7bfb7e 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -5336,10 +5336,14 @@ class Results } } + + $tag_params = array('title' => $title); + if (strpos($class, 'grid_edit') !== false) { + $tag_params['class'] = 'ajax'; + } $result .= Util::linkOrButton( 'sql.php' . Url::getCommon($_url_params), - $message, - array('class' => 'ajax', 'title' => $title) + $message, $tag_params ); }