gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2025-07-29 17:18:13 -03:00
commit e9ffe0ed45
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
psalm-baseline.xml
View File

@ -4070,9 +4070,6 @@
<code><![CDATA[$preCount]]></code>
<code><![CDATA[$total]]></code>
</UnusedParam>
<UnusedProperty>
<code><![CDATA[$queryTime]]></code>
</UnusedProperty>
</file>
<file src="src/Encoding.php">
<DeprecatedMethod>

2
resources/js/sql.ts
View File

@ -660,7 +660,7 @@ AJAX.registerOnload('sql.js', function () {
*/
$(document).on('makeGrid', '.sqlqueryresults', function () {
$('.table_results').each(function () {
if ($(this).find('td.grid_edit').length > 0) {
if (typeof window.makeGrid === 'function') {
window.makeGrid(this);
}
});

17
src/Display/Results.php
View File

@ -3008,11 +3008,18 @@ class Results
$sqlQueryMessage = Generator::getMessage($message, $this->sqlQuery, MessageType::Success);
} elseif (! $this->printView && ! $isLimitedDisplay) {
$sqlQueryMessage = Generator::getMessage(
__('Your SQL query has been executed successfully.'),
$this->sqlQuery,
MessageType::Success,
);
$message = Message::success(__('Your SQL query has been executed successfully.'));
if ($this->queryTime > 0) {
$message->addText('(');
$messageQueryTime = Message::notice(__('Query took %01.4f seconds.') . ')');
$messageQueryTime->addParam($this->queryTime);
$message->addMessage($messageQueryTime, '');
}
$sqlQueryMessage = Generator::getMessage($message, $this->sqlQuery, MessageType::Success);
}
// 2.3 Prepare the navigation bars