Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Simon Welsh
d774bab988
REGRESSION: fixed background color for PaddedImage
2013-06-19 20:35:24 +12:00
g4b0
c06a9095df
REGRESSION: fixed background color for PaddedImage
2013-06-19 10:19:54 +02:00
Jeremy Thomerson
6f16034ac8
MINOR: fix a couple minor typos
2013-06-18 18:28:46 +00:00
Will Rossiter
0129e185b8
Coding conventions, PHPDoc cleanup
2013-06-15 12:06:24 +12:00
Ingo Schommer
bf788c4bab
Merge pull request #2022 from willmorgan/patch-2
...
Allow canCreate to be extended via Object->extend
2013-06-13 11:19:00 -07:00
Ingo Schommer
5a94e621c5
Replace DataObject->isNotNull() helper with closure
...
Now possible since we support PHP 5.3+ only.
2013-06-13 07:53:27 +02:00
Damian Mooyman
be986c6524
API Allow $summary_fields to support methods on DBFields
2013-06-13 09:41:24 +12:00
Ingo Schommer
25ba77d333
Merge pull request #2062 from jthomerson/enhancement_3.1_allow_disabling_prepopulate_version_number_cache
...
ENHANCEMENT: allow disabling of Versioned prepopulate_versionnumber_cache
2013-06-12 01:59:49 -07:00
Stig Lindqvist
dbc2b62c69
Merge pull request #2054 from chillu/pulls/dataobject-duplicate-hasone
...
BUG Correct relation saving in DataObject->duplicateRelations()
2013-06-07 22:54:36 -07:00
Andrew Short
92135acc14
Merge pull request #2063 from g4b0/mysqldatabase-extensible
...
Enhancement: replaced private with protected
2013-06-07 07:51:49 -07:00
Ingo Schommer
23e51b871b
BUG Accept $limit=0 in SQLQuery->setLimit()
...
SQLQuery->setLimit(0, 99) should result in "SELECT ... LIMIT 0 OFFSET 1".
In fact it does "SELECT ..." without a LIMIT clause at all,
which is unexpected. This is regardless of the $offset value.
2013-06-06 15:27:14 +02:00
g4b0
6618507823
Enhancement: replaced privete with protected in order to have MySQLDatabase class extensible
2013-06-06 09:06:55 +02:00
Jeremy Thomerson
80808a1537
ENHANCEMENT: allow disabling of Versioned prepopulate_versionnumber_cache
...
In large sites this can take a very long time, drastically slowing down the CMS
admin. Even though the versions will then need to be queried individually,
this is still significantly faster than loading hundreds of thousands of
version numbers in one query and populating the cache array.
2013-06-04 13:43:58 +00:00
Will Morgan
2a91d27ccb
NEW use Injector pattern to create ValidationResult in validate
...
helps for custom validation implementations
2013-06-03 17:12:58 +02:00
Ingo Schommer
f61ab7305d
BUG Correct relation saving in DataObject->duplicateRelations()
...
This caused problems when duplicate() was used in the CMS UI
to duplicate a SiteTree object. Since every object of this type
has a ParentID relation, it copied this empty relation into
new "ghost page".
See https://github.com/silverstripe/silverstripe-cms/issues/689
2013-06-03 15:57:20 +02:00
Sean Harvey
1cebfc5d51
Revert "FIX make augmentSQL API consistent for strict PHP"
...
This reverts commit ab40dcc0ca
.
2013-06-01 11:51:01 +12:00
Jeremy Thomerson
ab40dcc0ca
FIX make augmentSQL API consistent for strict PHP
...
This references silverstripe/silverstripe-translatable#113
For that issue, we needed to have the DataQuery as the second parameter to
DataQuery's augmentSQL call. Fortunately, DataQuery was already passing this
argument. However, where the function was defined in DataExtension, the
argument was not present. Thus, subclasses of DataExtension could not add the
parameter to their function signature if they were running in PHP strict mode
because PHP will complain that the signatures don't match.
2013-05-31 19:24:12 +00:00
Ingo Schommer
88536998b9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-05-31 18:08:59 +02:00
Loz Calver
4a158454d6
FIX: Convert newlines to <br /> tags in string fields ( fixes #1942 )
2013-05-30 09:26:58 +01:00
Ingo Schommer
1ffbbb5377
Merge pull request #2029 from nedmas/patch-2
...
FIX: Add missing 'groupby' method
2013-05-29 14:30:04 -07:00
Tom Densham
3290511141
FIX: Add missing 'groupby' and remove redundant conditional in 'having'
2013-05-29 22:19:39 +01:00
Will Morgan
a307753886
Using extendedCan for can*
2013-05-29 11:12:02 +01:00
Damian Mooyman
0ee79d43db
BUG Fixed major issue with testing dataobjects that implement TestOnly and extend non-TestOnly dataobjects. Database regeneration would incorrectly populate the ClassName column
2013-05-27 16:39:57 +12:00
Sam Minnée
c26ddee191
Merge pull request #1861 from raket/dataobject-update-orphan
...
Fix: Orphaned records when running DataObject::update
2013-05-24 19:48:48 -07:00
Will Rossiter
438066dc14
Merge pull request #1990 from JayDevlin/1971-text-contextsummary
...
FIX #1971 : Text->ContextSummary
2013-05-24 15:19:48 -07:00
Will Rossiter
50936ee799
Merge pull request #1992 from jthomerson/fix_unsaved_relation_list_constructor
...
FIX: UnsavedRelationList did not call its constructor
2013-05-24 15:19:19 -07:00
Jeremy Thomerson
5512d7c0d0
FIX: UnsavedRelationList did not call its constructor
...
This resulted in Object extensions not working for it, and methods not existing
where they should have. It also resulted in poor error messages appearing when
thrown from Object since $this->class was empty since the constructor was never
called in Object.
2013-05-24 21:14:45 +00:00
Devlin
edaf709783
FIX #1971 : Check if the search term is set
2013-05-24 16:57:38 +02:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Will Rossiter
651c968915
Remove redundant get_extra_config(). ( Fixes #1973 )
2013-05-23 18:40:52 +12:00
Damian Mooyman
734a5fb469
BUG Fixed declaration of Versioned::updateCMSFields to be compatible with DataExtension::updateCMSFields
2013-05-22 08:08:11 +12:00
Will Rossiter
5ec4f3146f
Merge pull request #1869 from wilr/open6236
...
FIX: Remove version field from default scaffolded CMS fields.
2013-05-21 03:50:55 -07:00
Will Rossiter
f6cd582dd9
FIX: Remove version field from default scaffolded CMS fields.
2013-05-21 22:47:54 +12:00
Will Rossiter
90c274b640
Merge pull request #1852 from wilr/open-5117
...
FIX: Falling back to summaryFields() should skip non database fields.
2013-05-21 03:44:57 -07:00
Ingo Schommer
30906c8b31
Merge pull request #1962 from wilr/api-links
...
Update @package, @subpackage labels
2013-05-21 03:27:22 -07:00
Will Rossiter
ddcfcf7bed
Update @package, @subpackage labels
...
Cleanup of framework's use of @package and @subpackage labels and additional of labels for classes missing packages.
Moved all GridField related components to the one name.
Countless spelling fixes, grammar for other comments.
Link ClassName references in file headers.
2013-05-21 22:24:41 +12:00
Sean Harvey
34b9952e9d
Consistently instantiate HasManyList and ManyManyList using create()
2013-05-21 18:13:15 +12:00
Sean Harvey
13e632d053
Merge pull request #1867 from tractorcow/3.1-urlsegmentfilter-fixes
...
BUG Fixes issue with "+" characters in url.
2013-05-20 00:36:18 -07:00
Ingo Schommer
8bf2f16c75
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
README.md
2013-05-17 13:50:40 +02:00
Ingo Schommer
79cf1faf53
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
README.md
composer.json
docs/en/installation/from-source.md
docs/en/misc/contributing.md
model/Database.php
2013-05-17 00:37:30 +02:00
Damian Mooyman
6e0e3564e1
NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields to allow user code better control over interaction with extending methods
2013-05-16 10:34:45 +12:00
Will Rossiter
7ade1ebd59
FIX: Money should use current locale by default. ( Fixes : #6558 )
2013-05-11 23:30:13 +12:00
Will Rossiter
1bc945f98c
Partial code formatting / phpdoc cleanup of Versioned
2013-05-10 21:19:16 +12:00
Damian Mooyman
de41a2a75e
BUG Fixes issue with '+' characters in url.
2013-05-10 16:16:31 +12:00
Ingo Schommer
3b02d22989
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02:00
Marcus Dalgren
7f871fa18b
Fix orphaned records when running update
...
When DataObject::update() is run with relation fields and the relationship
is new the relationship ID was not set on the DataObject. This patch fixes
this. Fixes issue 6195 in open.silverstripe.org.
2013-05-09 03:53:53 +02:00
Will Rossiter
16231ce253
FIX: Falling back to summaryFields() should skip non database fields.
2013-05-08 23:05:05 +12:00
Ingo Schommer
c01511eaa3
Merge pull request #1854 from wilr/image-derp
...
Deprecate Image::loadUploadedImage(), Use Upload::load()
2013-05-08 03:01:41 -07:00
Will Rossiter
b2937decfc
Deprecate Image::loadUploadedImage(), Use Upload::load()
2013-05-08 21:49:38 +12:00