diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 7a5b752196..28c89eb9d4 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -1482,7 +1482,7 @@ class Results
. ($theme instanceof Theme ? $theme->getImgPath($tmpImageFile) : '')
. '" alt="' . $tmpTxt . '" title="' . $tmpTxt . '">';
- return Generator::linkOrButton(Url::getFromRoute('/sql'), $urlParamsFullText, $tmpImage);
+ return Generator::linkOrButton(Url::getFromRoute('/sql', $urlParamsFullText, false), null, $tmpImage);
}
/**
@@ -1878,16 +1878,15 @@ class Results
array $orderUrlParams,
array $multiOrderUrlParams
): string {
- $urlPath = Url::getFromRoute('/sql');
+ $urlPath = Url::getFromRoute('/sql', $multiOrderUrlParams, false);
$innerLinkContent = htmlspecialchars($fieldsMeta->name) . $orderImg
. '';
return Generator::linkOrButton(
- Url::getFromRoute('/sql'),
- $orderUrlParams,
+ Url::getFromRoute('/sql', $orderUrlParams, false),
+ null,
$innerLinkContent,
['class' => 'sortlink']
);
@@ -4495,8 +4494,8 @@ class Results
}
$value .= Generator::linkOrButton(
- Url::getFromRoute('/sql'),
- $urlParams,
+ Url::getFromRoute('/sql', $urlParams, false),
+ null,
$displayedData,
$tagParams
);
diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php
index ed573cfdc6..91c382d254 100644
--- a/libraries/classes/Url.php
+++ b/libraries/classes/Url.php
@@ -349,8 +349,8 @@ class Url
* @param string $route Route to use
* @param array $additionalParameters Additional URL parameters
*/
- public static function getFromRoute(string $route, array $additionalParameters = []): string
+ public static function getFromRoute(string $route, array $additionalParameters = [], bool $encrypt = true): string
{
- return 'index.php?route=' . $route . self::getCommon($additionalParameters, self::getArgSeparator());
+ return 'index.php?route=' . $route . self::getCommon($additionalParameters, self::getArgSeparator(), $encrypt);
}
}
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 0dbdaed742..d5d5bab312 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -2615,9 +2615,9 @@ class Util
$urlParams['tbl_group'] = $_REQUEST['tbl_group'];
}
- $url = Url::getFromRoute('/database/structure');
+ $url = Url::getFromRoute('/database/structure', $urlParams, false);
- return Generator::linkOrButton($url, $urlParams, $title . $orderImg, $orderLinkParams);
+ return Generator::linkOrButton($url, null, $title . $orderImg, $orderLinkParams);
}
/**
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9839c0c226..909adee7bc 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3295,11 +3295,6 @@ parameters:
count: 2
path: libraries/classes/Display/Results.php
- -
- message: "#^Parameter \\#1 \\$params of static method PhpMyAdmin\\\\Url\\:\\:getCommon\\(\\) expects array\\, array\\ given\\.$#"
- count: 1
- path: libraries/classes/Display/Results.php
-
-
message: "#^Parameter \\#3 \\$colOrder of method PhpMyAdmin\\\\Display\\\\Results\\:\\:getRowValues\\(\\) expects array\\|false, mixed given\\.$#"
count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d682318aa8..2fc049085a 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -5988,9 +5988,8 @@
-
+
$added[$orgFullTableName]
- $multiOrderUrlParams
$sortExpressionNoDirection
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index ce4e0abf91..76cc823d9a 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -1465,12 +1465,12 @@ class ResultsTest extends AbstractTestCase
'columns' => [
[
'column_name' => 'id',
- 'order_link' => 'id'
. ''
@@ -1492,12 +1492,12 @@ class ResultsTest extends AbstractTestCase
],
[
'column_name' => 'name',
- 'order_link' => 'name'
. ''
@@ -1519,13 +1519,13 @@ class ResultsTest extends AbstractTestCase
],
[
'column_name' => 'datetimefield',
- 'order_link' => 'datetimefield'
. '