Merge remote-tracking branch 'origin/master'

This commit is contained in:
Thierry François 2018-03-06 14:33:26 +02:00
commit e26ad4548b

View File

@ -60,7 +60,7 @@ class BulkUploader implements GridField_HTMLProvider, GridField_URLHandler
* @param string $fileRelationName
* @param string $recordClassName
*/
public function __construct($fileRelationName = null, $recordClassName = null, $autoPublishDataObject = false)
public function __construct($fileRelationName = null, $recordClassName = null, $autoPublish = false)
{
if ($fileRelationName != null) {
$this->setConfig('fileRelationName', $fileRelationName);