Visitar URL original
Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@7d1ddd2 · GitHub
Skip to content

Commit 7d1ddd2

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents 5865443 + 4929e98 commit 7d1ddd2

7 files changed

Lines changed: 32 additions & 5 deletions

File tree

‎README.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Code status
1616
:alt: End-to-End tests
1717
:target: https://github.com/phpmyadmin/phpmyadmin/actions/workflows/test-selenium.yml?query=branch%3Amaster
1818

19-
.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=latest
20-
:target: https://docs.phpmyadmin.net/en/latest/
19+
.. image:: https://readthedocs.org/projects/phpmyadmin/badge/?version=master
20+
:target: https://docs.phpmyadmin.net/en/master/
2121
:alt: Documentation build status
2222

2323
.. image:: https://hosted.weblate.org/widgets/phpmyadmin/-/master/svg-badge.svg
@@ -40,7 +40,7 @@ Code status
4040
:alt: Type coverage
4141
:target: https://shepherd.dev/github/phpmyadmin/phpmyadmin
4242

43-
.. image:: https://badge.stryker-mutator.io/github.com/phpmyadmin/phpmyadmin/master
43+
.. image:: https://img.shields.io/endpoint?url=https://badge-api.stryker-mutator.io/github.com/phpmyadmin/phpmyadmin/master
4444
:alt: Infection MSI
4545
:target: https://infection.github.io
4646

‎public/themes/bootstrap/scss/_tables.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
.table {
2+
th,
3+
td {
4+
> span:empty::before {
5+
content: "\200b";
6+
}
7+
}
8+
}
9+
110
@media only screen and (width >= 768px) {
211
.table th.position-sticky {
312
top: 96px;

‎public/themes/metro/scss/_tables.scss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
}
1818
}
1919

20+
th,
21+
td {
22+
> span:empty::before {
23+
content: "\200b";
24+
}
25+
}
26+
2027
caption {
2128
font-family: $font-family-bold;
2229
background-color: $th-background;

‎public/themes/original/scss/_tables.scss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@
1111
background-color: $th-background;
1212
}
1313

14+
th,
15+
td {
16+
> span:empty::before {
17+
content: "\200b";
18+
}
19+
}
20+
1421
thead th {
1522
border-bottom: 0;
1623
}

‎public/themes/pmahomme/scss/_tables.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
td {
66
text-shadow: 0 1px 0 #fff;
77
vertical-align: middle;
8+
9+
> span:empty::before {
10+
content: "\200b";
11+
}
812
}
913

1014
th {

‎resources/js/src/makegrid.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine
16041604
isValueUpdated = thisFieldParams[fieldName] !== getCellValue(g.currentEditCell);
16051605
} else {
16061606
const JSONString = stringifyJSON(thisFieldParams[fieldName]);
1607-
isValueUpdated = JSONString !== JSON.stringify(JSON.parse(getCellValue(g.currentEditCell)));
1607+
isValueUpdated = JSONString !== stringifyJSON(getCellValue(g.currentEditCell));
16081608
}
16091609

16101610
if (g.wasEditedCellNull || isValueUpdated) {

‎src/Display/Results.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3123,7 +3123,7 @@ public function getTable(
31233123

31243124
// 2.1 Prepares a messages with position information
31253125
$sqlQueryMessage = '';
3126-
if ($displayParts->hasQueryStats) {
3126+
if ($displayParts->hasQueryStats && $total > 0) {
31273127
$message = $this->setMessageInformation(
31283128
$sortedColumnMessage,
31293129
$statementInfo,

0 commit comments

Comments
 (0)