Merge branch '4.4' into 4

docs/en/04_Changelogs/4.2.5.md

@@ -0,0 +1,36 @@
+# 4.2.5
+
+<!--- Changes below this line will be automatically regenerated -->
+
+## Change Log
+
+### Security
+
+ * 2018-12-18 [95505db7d](https://github.com/silverstripe/silverstripe-framework/commit/95505db7d666a75f249f65cb1af74dca01d39add) Fix potential SQL vulnerability in non-scalar value hyrdation (Maxime Rainville) - See [ss-2018-021](https://www.silverstripe.org/download/security-releases/ss-2018-021)
+
+### Features and Enhancements
+
+ * 2019-05-30 [c569cec4](https://github.com/silverstripe/silverstripe-cms/commit/c569cec4ea49612ddc9d430d7fe792971c93c586) Add updateHintsCacheKey extension point to fix invalid caching (Garion Herman)
+ * 2018-11-27 [a8f4f23c6](https://github.com/silverstripe/silverstripe-framework/commit/a8f4f23c660474e965b510ba1bb04bf7a145d5b0) Add visibility updates to `upgrade.yml`. (bergice)
+
+### Bugfixes
+
+ * 2019-05-24 [25aa3af03](https://github.com/silverstripe/silverstripe-framework/commit/25aa3af032f24314ac458743db78028e1aa66ead) HeaderField requires the optional Title field (Dylan Wagstaff)
+ * 2019-05-14 [3f1479edb](https://github.com/silverstripe/silverstripe-framework/commit/3f1479edbbe406a6b9ca1c5284f2daabf455c8b5) DataQuery overwriting _SortColumn selects (#8974) (Aaron Carlino)
+ * 2019-05-13 [3a5c14f7c](https://github.com/silverstripe/silverstripe-framework/commit/3a5c14f7c288ce160012651869cb2458eee18b6b) password validation min length message (#8976) (Guy Marriott)
+ * 2019-05-13 [db0e6f710](https://github.com/silverstripe/silverstripe-framework/commit/db0e6f7104d6250d0afe3d717b70497ee6fade2d) Fix password validation min length message (matt-in-a-hat)
+ * 2019-04-18 [e6c1061](https://github.com/silverstripe/silverstripe-asset-admin/commit/e6c1061600941ffa26ec42fc4fc7032d894e944d) folders always go first when ordering (#936) (Serge Latyntsev)
+ * 2019-04-09 [661a27e](https://github.com/silverstripe/silverstripe-assets/commit/661a27e93efcf98c2521b42ec802ecf625e0a6ea) Fix hash redirection logic on PostreSQL and add PostreSQL to the travis matrix (#237) (Serge Latyntsev)
+ * 2019-04-04 [759968bbe](https://github.com/silverstripe/silverstripe-framework/commit/759968bbe2f8e3a4087b2f08622abc4cc70f2867) Fix Undefined variable: result when catch Exception (Ian Patel)
+ * 2019-03-26 [83ec0b69f](https://github.com/silverstripe/silverstripe-framework/commit/83ec0b69fa642ed1ad734fff10ea6dc3aeba6cf3) Resolve issue where schema changes between enum / non-enum types (Damian Mooyman)
+ * 2019-03-25 [fae19c16b](https://github.com/silverstripe/silverstripe-framework/commit/fae19c16b54f077bbd7665a50df516d290faa07e) has_one File form scaffolding (Jonathon Menz)
+ * 2019-03-18 [d76ce85](https://github.com/silverstripe/silverstripe-assets/commit/d76ce8535aba9cbf1c226963cb1003ef06aa24ac) Redirect legacy assets and replaced assets (fixes #218) (Maxime Rainville)
+ * 2019-03-05 [7416ce275](https://github.com/silverstripe/silverstripe-framework/commit/7416ce275ba6384fe6e2685078d3cf02d0322218) doInit comparison should be lowercased (Daniel Hensby)
+ * 2019-02-27 [d1396b7df](https://github.com/silverstripe/silverstripe-framework/commit/d1396b7dfe91138dcda53df0c0378281e7edb771) Fix writeBaseRecord with unique indexes (Damian Mooyman)
+ * 2019-02-26 [6ff319a0e](https://github.com/silverstripe/silverstripe-framework/commit/6ff319a0e1c4cfc15e24580bac07dfef38702942) Implement peer review feedback, (Maxime Rainville)
+ * 2019-02-25 [404e934](https://github.com/silverstripe/silverstripe-versioned/commit/404e9348c1209d50c729cd14b8de366a0a10b8bb) Fixed Wrong Silverstripe Requirement (Ben Rhodes)
+ * 2019-02-21 [9a59f2f57](https://github.com/silverstripe/silverstripe-framework/commit/9a59f2f57dfd5fe0f054b01404bc2bd958ad8d99) Renable the ability to do dynamic assignment with DBField (Maxime Rainville)
+ * 2019-01-29 [f918dcd36](https://github.com/silverstripe/silverstripe-framework/commit/f918dcd36a177adb8abee751d27a809f25a0afab) Escape wildcard characters when matching database name in databaseExists (Guy Marriott)
+ * 2019-01-28 [dc9d1b9cc](https://github.com/silverstripe/silverstripe-framework/commit/dc9d1b9cc0d3b14929fe2675282980a2750fb4cf) GridFieldPrintButton no longer assumes that children of GridField would implement their own print template (Robbie Averill)
+ * 2019-01-24 [d530bc2fb](https://github.com/silverstripe/silverstripe-framework/commit/d530bc2fb6c8c290f1f75f39bc4ec898cc326cf1) fix user feedback when jquery could not be loaded (Benedikt Seidl)
+ * 2018-12-12 [0491ca03c](https://github.com/silverstripe/silverstripe-framework/commit/0491ca03cfcbd81690c54cc00f6234675978ef39) prevent death on urls with querystrings & anchors (mikeyc7m)

lang/en.yml

@@ -35,8 +35,6 @@ en:
     MAXIMUM: 'Passwords must be at most {max} characters long.'
     SHOWONCLICKTITLE: 'Change Password'
   SilverStripe\Forms\DateField:
-    NOTSET: 'not set'
-    TODAY: today
     VALIDDATEFORMAT2: 'Please enter a valid date format ({format})'
     VALIDDATEMAXDATE: 'Your date has to be older or matching the maximum allowed date ({date})'
     VALIDDATEMINDATE: 'Your date has to be newer or matching the minimum allowed date ({date})'
@@ -76,7 +74,6 @@ en:
     LinkExisting: 'Link Existing'
     NewRecord: 'New {type}'
     NoItemsFound: 'No items found'
-    OpenFilter: 'Open search and filter'
     PRINTEDAT: 'Printed at'
     PRINTEDBY: 'Printed by'
     PlaceHolder: 'Find {type}'
@@ -102,17 +99,12 @@ en:
     PREVIOUS: 'Go to previous record'
   SilverStripe\Forms\GridField\GridFieldEditButton:
     EDIT: Edit
-  SilverStripe\Forms\GridField\GridFieldFilterHeader:
-    Search: 'Search "{name}"'
-    SearchFormFaliure: 'No search form could be generated'
   SilverStripe\Forms\GridField\GridFieldGroupDeleteAction:
     UnlinkSelfFailure: 'Cannot remove yourself from this group, you will lose admin rights'
   SilverStripe\Forms\GridField\GridFieldPaginator:
     OF: of
     Page: Page
     View: View
-  SilverStripe\Forms\GridField\GridFieldViewButton:
-    VIEW: View
   SilverStripe\Forms\MoneyField:
     FIELDLABELAMOUNT: Amount
     FIELDLABELCURRENCY: Currency

src/Dev/CsvBulkLoader.php

@@ -75,6 +75,7 @@ class CsvBulkLoader extends BulkLoader
         try {
             $filepath = Director::getAbsFile($filepath);
             $csvReader = Reader::createFromPath($filepath, 'r');
+            $csvReader->setDelimiter($this->delimiter);
 
             $tabExtractor = function ($row, $rowOffset, $iterator) {
                 foreach ($row as &$item) {