Commit Graph

23585 Commits

Author SHA1 Message Date
Guy Sartorelli
15e4cbeb7a
Merge branch '4' into 5.0 2023-08-10 11:46:33 +12:00
github-actions
4dd6b2f9b2 Merge branch '4.13' into 4 2023-08-09 23:40:11 +00:00
Guy Sartorelli
4ccfc371c6
Merge pull request #10912 from kinglozzer/10911-template-regression
FIX: Regression with include argument (fixes #10911)
2023-08-10 11:17:33 +12:00
Sabina Talipova
597d97bf0a
Merge pull request #10907 from creative-commoners/pulls/4.13/new-fields-validator
NEW Add FieldsValidator to ensure fields get validated
2023-08-10 10:50:57 +12:00
Loz Calver
8da4aa8637 FIX: Regression with include argument (fixes #10911) 2023-08-09 15:20:54 +01:00
Guy Sartorelli
4f6ab330f5
Merge pull request #10903 from creative-commoners/pulls/4.13/fix-multi-html-entities-in-shortcode
FIX Multi HTML entities in short codes
2023-08-08 13:20:17 +12:00
Sabina Talipova
037168a4fe FIX Multi HTML entities in shortcodes 2023-08-08 13:08:19 +12:00
Guy Sartorelli
5a52484d88
NEW Add FieldsValidator to ensure fields get validated 2023-08-08 13:02:27 +12:00
github-actions
a0d31c07db Merge branch '4.13' into 4 2023-08-07 08:34:58 +00:00
Guy Sartorelli
2a56cc3ea4
MNT Run ORM tests in parallel to other tests (#10901) 2023-08-07 11:57:23 +12:00
Guy Sartorelli
0e74e355eb
Merge pull request #10894 from lekoala/patch-43
Ensure cache key only contains valid characters
2023-08-03 19:15:38 +12:00
Guy Sartorelli
9e5411e905
Merge pull request #10885 from creative-commoners/pulls/4.13/search-in-non-existing-fields
FIX Image in summaryfields breaks search
2023-08-03 15:11:49 +12:00
Sabina Talipova
d24095aba8 FIX Image in summaryfields breaks search 2023-08-03 14:48:55 +12:00
Guy Sartorelli
b90d606427
Merge pull request #10834 from lekoala/patch-36
SessionAuthenticationHandler doesn't cache member query
2023-08-03 11:54:50 +12:00
Thomas Portelange
0e839e12cc
Update src/Core/Manifest/VersionProvider.php
Co-authored-by: Michal Kleiner <mk@011.nz>
2023-08-02 06:55:32 +02:00
Thomas Portelange
b9f63001c5
Update src/Core/Manifest/VersionProvider.php
Co-authored-by: Michal Kleiner <mk@011.nz>
2023-08-02 06:55:16 +02:00
Maxime Rainville
6ed50b5279
Merge pull request #10893 from lekoala/patch-42
include silverstripe core files into roots
2023-08-02 10:19:14 +12:00
Thomas Portelange
359cb1427a BUG include silverstripe core files into roots 2023-08-02 10:00:33 +12:00
Thomas Portelange
c0cc129f12
remove sprintf 2023-08-01 19:40:34 +02:00
Thomas Portelange
d3c2fa897c
nicer key 2023-08-01 14:27:00 +02:00
Steve Boyd
d9f40a2e3c Merge branch '4' into 5.0 2023-07-31 11:56:28 +12:00
Steve Boyd
f3061fe28e Merge branch '4.13' into 4 2023-07-31 11:56:04 +12:00
Guy Sartorelli
0a1c46e69f
Merge pull request #10895 from creative-commoners/pulls/4.13/cve-2023-32302
[CVE-2023-32302] Require password field to be non-empty
2023-07-31 11:24:46 +12:00
Steve Boyd
7b21b38ac4 [CVE-2023-32302] Require password field to be non-empty 2023-07-31 11:14:22 +12:00
Thomas Portelange
909bee8101
fix cache key 2023-07-29 08:56:24 +02:00
Steve Boyd
27ccbf77e3 Merge branch '4' into 5.0 2023-07-21 13:00:47 +12:00
github-actions
561b6be1fb Merge branch '4.13' into 4 2023-07-21 00:27:04 +00:00
Guy Sartorelli
cb7be276e7
Merge pull request #10882 from creative-commoners/pulls/4.13/tx-1689897618
ENH Update translations
2023-07-21 12:23:39 +12:00
Steve Boyd
93acba0535 ENH Update translations 2023-07-21 12:00:18 +12:00
github-actions
d8b69c36d9 Merge branch '4' into 5.0 2023-07-20 21:38:31 +00:00
github-actions
fc969b61cb Merge branch '4.13' into 4 2023-07-20 21:38:30 +00:00
Guy Sartorelli
c2a30d9b3b
Merge pull request #10881 from creative-commoners/pulls/4.13/double-assignement
MNT Tidy up double assignment
2023-07-21 09:36:04 +12:00
Steve Boyd
a16b268ff7 MNT Tidy up double assignment 2023-07-20 18:19:14 +12:00
Guy Sartorelli
ec99be0fd5
Merge pull request #10877 from creative-commoners/pulls/4.13/short-array-enum
FIX Short-array syntax for Enum
2023-07-20 16:41:29 +12:00
Steve Boyd
7daa3fdb08 FIX Short-array syntax for Enum 2023-07-20 16:06:01 +12:00
Guy Sartorelli
9b2aee10dc
Merge pull request #10868 from creative-commoners/pulls/5.0/unit-test
MNT Fix unit test
2023-07-12 11:56:09 +12:00
Steve Boyd
3aa6d590a1 MNT Fix unit test 2023-07-11 10:25:16 +12:00
Steve Boyd
b88e7feeeb Merge branch '4' into 5.0 2023-07-10 17:13:59 +12:00
Steve Boyd
193a12ac01 Merge branch '4.13' into 4 2023-07-10 17:13:19 +12:00
Guy Sartorelli
5854ce6190
Merge branch '4.13' into 5.0 2023-07-10 14:29:03 +12:00
Dylan Wagstaff
8c3ba81052
FIX PHP 8.1 support in MySQLiConnector::query errors (#10570)
* FIX PHP 8.1 support in MySQLiConnector::query errors

The default error reporting mode in PHP 8.1 has changed from using
errors reported on the connection handle to throwing
mysqli_sql_exception. query() makes no allowance for this, and
functions up the call stack expect to catch
Silverstripe\ORM\Connect\DatabaseException instead - resulting in the
MySQLi exception going all the way up to halt the system.

We can use a try, catch, and finally to retain backwards compatibility,
no matter which setting (e.g. PHP version default) someone has enabled.

* Move MySQLConnector test skip call into setUp()

As review feedback; marking the test as skipped in a private function
obfuscated where the call was happening and made it harder to skimread
the tests. Moving this into a setUp function makes it obvious the check
is run before each test case, and skipped if necessary.
2023-07-07 15:56:31 +12:00
Guy Sartorelli
612f7e734f
FIX Allow repeated iterations of predicated query result (#10857) 2023-07-05 16:25:58 +12:00
Sabina Talipova
bb5378e177
FIX Gridfiled pagination missing after search (#10828) 2023-06-26 12:11:33 +12:00
Thomas Portelange
9391e696bb
use Member::class 2023-06-23 09:35:34 +02:00
Thomas Portelange
2e73b5eeca
Use cached query
Fixes https://github.com/silverstripe/silverstripe-framework/issues/10833
2023-06-22 11:04:26 +02:00
Guy Sartorelli
fb7d2256f1
Merge branch '4.13' into 5.0 2023-06-22 11:18:46 +12:00
Guy Sartorelli
ab4802caaf
Merge pull request #10829 from creative-commoners/pulls/4.13/fix-last-page
FIX LastPage method returns true if TotalPages equals 0
2023-06-22 11:16:57 +12:00
Sabina Talipova
ad9df97626 FIX LastPage method returns true if TotalPages equals 0 2023-06-22 10:50:41 +12:00
Sabina Talipova
220fee6a44
Merge pull request #10823 from creative-commoners/pulls/5.0/duplicate
MNT Remove duplicate translation keys
2023-06-19 17:10:05 +12:00
Steve Boyd
90c50957fb MNT Remove duplicate translation keys 2023-06-19 14:13:12 +12:00