Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8

phpmyadmin · May 7, 2018 · efb51ae · efb51ae
2 parents 6aaaf10 + e6cc4fb
commit efb51ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -5336,10 +5336,14 @@ private function _getRowData(
                     }
 
                 }
+
+                $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
                 );
             }