Maxime Rainville
ac53f77115
Merge branch '4.0' into 4.1
2019-02-27 12:11:47 +13:00
Maxime Rainville
9a59f2f57d
BUG Renable the ability to do dynamic assignment with DBField
2019-02-22 11:08:43 +13:00
Robbie Averill
cb7f15a681
Merge branch '4.0' into 4.1
2019-02-19 08:36:41 +07:00
Maxime Rainville
95505db7d6
[SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation
2019-02-12 21:08:09 +13:00
Maxime Rainville
fd90cf6ceb
[SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation
2019-02-12 20:44:17 +13:00
Guy Marriott
f918dcd36a
FIX Escape wildcard characters when matching database name in databaseExists
2019-01-30 09:31:13 +13:00
Robbie Averill
fecedc2d98
[SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection
2018-12-11 20:56:40 +13:00
Robbie Averill
48bd335648
[SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection
2018-12-11 20:55:58 +13:00
Robbie Averill
b6ff21f72a
Merge branch '4.0' into 4.1
2018-09-06 13:26:13 +02:00
Maxime Rainville
dd3379e68f
Merge pull request #8075 from creative-commoners/pulls/4.0/remap-polymorphics
...
FIX Polymorphic relationship class columns have obsolete class names remapped
2018-08-28 17:03:39 +12:00
Robbie Averill
d651d0fbfc
FIX Use base class (not remapping target class) when looking up whether object is versioned
2018-08-28 14:15:02 +12:00
Robbie Averill
953153500d
FIX Polymorphic relationship class columns have obsolete class names remapped
2018-08-15 10:40:51 +12:00
Robbie Averill
d122995652
FIX Duplicate config values for cascade_duplicates no longer duplicate their duplicates
...
Previously you could define identical values for this config prop via a DataExtension and on the base
class, resulting in double duplication
2018-07-16 12:04:56 +12:00
Damian Mooyman
b636587945
Respect semver and add tests
2018-06-15 11:04:12 +12:00
Damian Mooyman
310a259c5f
Add locale to Format
...
Fix up some regressions
2018-06-14 17:28:16 +12:00
Damian Mooyman
02ae2e7ed0
BUG Fix internal date formatting inheriting default locale
...
Fixes #8097
2018-06-13 13:32:11 +12:00
Daniel Hensby
e260319823
Merge branch '4.0' into 4.1
2018-06-08 23:05:24 +01:00
Daniel Hensby
e1450b5e82
Merge pull request #8147 from kinglozzer/mysql-pdo-attr
...
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103 )
2018-06-08 13:06:03 +01:00
Damian Mooyman
29f9b1c18f
Fix linting issues
2018-06-08 11:38:36 +12:00
Loz Calver
66f57bd4da
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver ( fixes #8103 )
2018-06-07 10:26:00 +01:00
Damian Mooyman
0aa13da0d9
BUG Backport bugfix for belongs_many_many with many_many through.
...
Partial backport of #7928
Fixes #8131
2018-06-06 09:43:04 +12:00
Robbie Averill
c8b0bc0ad7
Merge branch '4.0' into 4.1
...
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
6d98a912c9
Merge branch 'heads/4.1.1' into 4.1
2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Robbie Averill
cd716fb61b
Switch check for is_string
2018-05-14 17:05:31 +12:00
Damian Mooyman
2e13ae746f
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:05:31 +12:00
Daniel Hensby
d5e2d3fa67
Merge branch '3.6' into 4.0
2018-05-01 21:47:17 +01:00
UndefinedOffset
d17f424541
Changed checked for UnsavedRelationList to ManyManyList
2018-04-18 12:15:16 -03:00
UndefinedOffset
fe4b90edc0
FIX: Duplicating many_many relationships looses the extra fields in 4.0
2018-04-18 11:49:20 -03:00
Damian Mooyman
99426cdb05
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-04-04 17:36:45 +12:00
Andreas Lindahl
dd44deacb4
Fix for "too few parameters" error when using DBMultiEnum
2018-03-28 16:42:12 +02:00
Daniel Hensby
ec6ff71107
Merge branch '4.0' into 4.1
2018-03-14 14:09:40 +00:00
Daniel Hensby
d28a1b5cfc
Merge branch '3.6' into 4.0
2018-03-14 14:08:41 +00:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Roman Schmid
40c2e299a0
Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for DBText::ContextSummary.
...
Add unit-test to cover that case.
2018-03-01 11:39:30 +01:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1
2018-02-21 13:40:30 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 12:20:18 +13:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1
2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0
2018-02-09 14:32:58 +00:00
Daniel Hensby
d3278d5470
FIX Add Nested DB transaction support ( #7848 )
...
* TEST Prove nested transactions break
* Add nested transaction support
2018-02-09 10:28:32 +13:00
Damian Mooyman
db9aa2c5c7
BUG Fix regression in has_one getters breaking DataDifferencer
2018-02-05 16:16:07 +13:00
Damian Mooyman
aa2c71424d
API Implement cascade_duplications
...
API Add DataObject::setComponent()
API Support unary components as getter and setter fields
API ManyManyList::add() now supports unsaved records
ENHANCEMENT Animal farm
2018-02-05 12:04:57 +13:00
Damian Mooyman
76d2db12b0
Merge pull request #7794 from kinglozzer/id-like-to-place-an-ordinal
...
NEW: Add support for ordinals in DBDate::Format()
2018-01-26 09:27:46 +13:00
Loz Calver
fcf5022550
NEW: Add support for ordinals in DBDate::Format()
2018-01-25 09:41:06 +00:00
Damian Mooyman
bca47029c4
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Control/SimpleResourceURLGenerator.php
# tests/php/Control/SimpleResourceURLGeneratorTest.php
2018-01-25 12:53:15 +13:00
Roman Schmid
6fafce766e
Fixed Rfc3339 implementation of Date and Datetime
2018-01-24 16:58:12 +01:00
Damian Mooyman
3fce5372b0
DOC Fix phpdoc on ArrayList::limit
...
Fixes #7781
2018-01-24 10:18:15 +13:00
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/TempFolder.php
# src/ORM/DataObject.php
# src/View/ThemeResourceLoader.php
# src/includes/constants.php
# tests/php/Control/SimpleResourceURLGeneratorTest.php
# tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
# tests/php/View/RequirementsTest.php
2018-01-22 14:57:05 +13:00
Daniel Hensby
db610aaf3b
Fixing string concat CS issues
2018-01-16 18:39:30 +00:00
