Skip to content

[pull] master from phpmyadmin:master#157

Merged
pull[bot] merged 12 commits intokkpan11:masterfrom
phpmyadmin:master
Jun 19, 2024
Merged

[pull] master from phpmyadmin:master#157
pull[bot] merged 12 commits intokkpan11:masterfrom
phpmyadmin:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Jun 17, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

MoonE and others added 12 commits June 1, 2024 00:16
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
Currently translated at 45.4% (1557 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/az/
Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 99.9% (3426 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/nl/
Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 95.9% (3288 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/zh_Hant/
Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 100.0% (3427 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
Currently translated at 96.4% (3305 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/zh_Hant/
Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Fixes #19187

Depends on phpmyadmin/sql-parser#560 to work
without regression in the case of a condition `0` because now the
query is parsed and built again to remove comments.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
The PR will modify the 'GetCookieName' functtion by hard coding the prefix ' __Secure-' to each cookie name when 'isHttps()' is true, Apparently the prefix will be recognise
d and enforced by most browsers (ignored by the older ones).Update Config.php

The raison d'aitre for this PR is contained in my issue # 18608.

This PR will replace the line 953, part of the GetCookieName function :
return $cookieName . ( $this->isHttps ? '_https' : '' );

with the amended line:
return ( $this->isHttps() ? '__Secure-' : '’ ) . $cookieName . ( $this->isHttps() ? '_https' : ‘’ );

Signed-off-by: martin762 <martin762green@btinternet.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Fixes #18608

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
@pull pull bot added the ⤵️ pull label Jun 17, 2024
@pull pull bot merged commit ad5d50d into kkpan11:master Jun 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants