diff --git a/_config.php b/_config.php index 5ed7c55..f31daa4 100644 --- a/_config.php +++ b/_config.php @@ -6,3 +6,9 @@ if (!defined('BULKEDITTOOLS_PATH')) { define('BULKEDITTOOLS_UPLOAD_PATH', $folder.'/bulkUpload'); define('BULKEDITTOOLS_MANAGER_PATH', $folder.'/bulkManager'); } + +// Ensure compatibility with PHP 7.2 ("object" is a reserved word), +// with SilverStripe 3.6 (using Object) and SilverStripe 3.7 (using SS_Object) +if (!class_exists('SS_Object')) { + class_alias('Object', 'SS_Object'); +} diff --git a/bulkUpload/code/GridFieldBulkUpload_Request.php b/bulkUpload/code/GridFieldBulkUpload_Request.php index 39b6740..40d49cc 100644 --- a/bulkUpload/code/GridFieldBulkUpload_Request.php +++ b/bulkUpload/code/GridFieldBulkUpload_Request.php @@ -84,7 +84,7 @@ class GridFieldBulkUpload_Request extends RequestHandler { //create record $recordClass = $this->component->getRecordClassName($this->gridField); - $record = Object::create($recordClass); + $record = SS_Object::create($recordClass); $record->write(); // passes the current gridfield-instance to a call-back method on the new object @@ -215,7 +215,7 @@ class GridFieldBulkUpload_Request extends RequestHandler foreach ($attachResponses as $attachResponse) { // create record - $record = Object::create($recordClass); + $record = SS_Object::create($recordClass); $record->write(); $record->extend('onBulkUpload', $this->gridField);