Commit Graph

1148 Commits

Author SHA1 Message Date
Serge Latyntcev
014c99a128 Merge branch '3.6' into 3.7 2019-09-23 13:54:16 +12:00
Maxime Rainville
4ec1a682cf BUG Renable the ability to do dynamic assignment with DBField 2019-02-22 12:09:15 +13:00
Aaron Carlino
c44f06cdf1 [SS-2018-021] Patch SQL Injection vulnerability when arrays are assigned to DataObject Fields 2019-02-12 21:58:27 +13:00
Aaron Carlino
6bf9542d66 [SS-2018-021] Patch SQL Injection vulnerability when arrays are assigned to DataObject Fields 2019-02-12 21:36:50 +13:00
lerni
16a837d6a0 fix [Warning] on count() with PHP >= 7.2 2019-01-11 17:22:58 +01:00
Sam Minnee
ae9ab22a8f FIX: Use DELETE FROM instead of TRUNCATE for clearTable
clearTable is mainly used for clearing data between tests. In this case,
there are very few or zero records, and DELETE FROM is quicker than
TRUNCATE, which works by deleting and recreating the table.

This materially speeds up test execution, at least on MySQL.
2018-10-03 13:19:31 +13:00
botzkobg
d247027d0f
Add 'updateComponents' extend in DataObject->getComponents() 2018-06-28 11:07:20 +01:00
Damian Mooyman
4035b3ff87
Reverse 5b6a39e71a 2018-06-19 11:06:13 +12:00
Damian Mooyman
1acb80851c
Merge pull request #8154 from xini/patch-4
fix Versioned::choose_site_stage() if no request given
2018-06-13 13:45:00 +12:00
Florian Thoma
c9005b2a70 add check for currentl controller 2018-06-11 08:07:37 +02:00
Damian Mooyman
02cd32acb3
BUG Error if invalid stage specified for get_by_stage 2018-06-11 15:04:43 +12:00
Florian Thoma
42e799bc43
fix Versioned::choose_site_stage() if no request given
Load request from curent controller as a fallback
2018-06-09 20:37:52 +02:00
Damian Mooyman
4a0e5b6367
BUG Fix crash on fixed_fields in default_sort 2018-06-07 14:54:04 +12:00
Aaron Carlino
c639ffa9ce New isPopulated method to allow StringField subclasses to check existence without RAW 2018-06-06 23:26:07 +12:00
Daniel Hensby
a20b0a4aa6
FIX Remove use of deprecated each method 2018-06-04 16:17:18 +01:00
Damian Mooyman
47a9cdfd49 ENHANCEMENT Backport of querystring work to 3.x (#8026)
* WIP Backport of querystring work to 3.x

* Remove dataextension requirement

* Fix up bootstrapping

* more backporting

* Bug fix some tests

* Fix up some tests

* Fix support for custom stages
Don't set empty stage

* Better cache typehint

* Make sure useDraftSite(false) re-enables secure site

* Remove unnecessary guard around controller property
2018-05-08 10:04:44 +12:00
Daniel Hensby
c31251911c
Merge branch '3.6' into 3 2018-04-18 13:14:46 +01:00
Daniel Hensby
8359f3dc97
Merge branch '3.5' into 3.6 2018-04-18 13:14:07 +01:00
UndefinedOffset
36198c482e
Removed extra lookup of the list 2018-04-18 12:16:12 +01:00
UndefinedOffset
af3a9f3ec8
FIX: Duplicating many_many relationships looses the extra fields (fixes #7973) 2018-04-18 12:16:02 +01:00
Loz Calver
ebd3fb6526 FIX: Don't auto-generate indexes for Text field types (fixes #7900) 2018-04-09 16:44:31 +01:00
Daniel Hensby
2c6f588785
Merge branch '3.6' into 3 2018-03-14 13:53:37 +00:00
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6 2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5 Updated the DocBlock for ManyManyList's add() method 2018-03-11 14:49:17 -06:00
Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts 2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2 Remove short array syntax 2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288 Fix indentation 2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063 Back port 4.0 implementation of numeric/assoc key merging for summary_fields 2018-02-27 16:42:44 +13:00
Daniel Hensby
4ca385e033
Partial revert of #7665 - overzealous string renames 2018-02-09 19:27:45 +00:00
Daniel Hensby
85e97d204b
Partial revert of #7665 - bad docblock changes 2018-02-09 19:27:11 +00:00
Damian Mooyman
f4b13fb2c4
Merge remote-tracking branch 'origin/3.6' into 3
# Conflicts:
#	model/DataQuery.php
2018-02-05 16:53:15 +13:00
Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-02-05 15:07:21 +13:00
Damian Mooyman
aca1e16b8e
Merge pull request #6211 from jason-zz/patch-3
BUG Fix : relObject() should return null if one of the node is null
2018-02-05 14:18:44 +13:00
Damian Mooyman
4da99efd5d
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-01-31 16:03:42 +13:00
Daniel Hensby
74a3ba54ae
FIX count size of $relations 2018-01-30 16:50:33 +00:00
Daniel Hensby
9103816333
NEW Add php 7.2 support 2018-01-30 16:50:32 +00:00
Dominik Beerbohm
416915b082 BUG tableName is blank in CompositeDBField->addToQuery
Added call to setTable() to ensure tableName is provided inside addToQuery method.
2018-01-26 14:58:46 +01:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3 2017-12-07 13:20:58 +13:00
Daniel Hensby
89166a2ff2
Try using parseSortColumn from ArrayList 2017-12-06 13:38:58 +00:00
Daniel Hensby
2e43780a8a
NEW Add sort columns to DB index automatically 2017-12-06 13:38:25 +00:00
Damian Mooyman
e281c64fca
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6 2017-12-06 17:32:56 +13:00
Damian Mooyman
a8465900bd
Merge pull request #47 from silverstripe-security/patch/3.5/SS-2017-008
[SS-2017-008] FIX Make sure int params are successfull cast to int
2017-12-06 17:30:51 +13:00
Damian Mooyman
91cf85087b
Merge remote-tracking branch 'origin/3.5' into 3.6 2017-12-06 17:21:09 +13:00
Damian Mooyman
77b46672e2
Merge branch '3.5' into pulls/3.5/versioned-base-class 2017-12-06 11:37:46 +13:00
Daniel Hensby
2aa1d8f2c4
remove create_function usage 2017-12-05 14:20:13 +00:00
Daniel Hensby
84d7afb347
FIX Use baseDataClass for allVersions as with other methods 2017-12-05 13:02:20 +00:00
Daniel Hensby
fd201bc71b
Merge branch '3.6' into 3 2017-11-25 16:18:46 +00:00
Daniel Hensby
badeb0cc8c
Merge branch '3.5' into 3.6 2017-11-25 16:17:36 +00:00
Daniel Hensby
0f2049d4d4
[SS-2017-008] Fix SQL injection in search engine 2017-11-21 14:45:36 +00:00
Ingo Schommer
d39e9b0bb0 Make DataDifferencer injectable
Requested by Steve Boyd
2017-11-20 15:47:35 +13:00