From f207a2e4f9abd6f1f85e000ef74a0c1791d8fed7 Mon Sep 17 00:00:00 2001
From: Marc Espiard <marc@firebrand.nz>
Date: Fri, 5 Oct 2018 11:04:32 +1300
Subject: [PATCH] Ensure compatibility with SS 3.7 & PHP 7.2

---
 _config.php                  | 8 +++++++-
 code/FileAttachmentField.php | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 _config.php
 mode change 100644 => 100755 code/FileAttachmentField.php

diff --git a/_config.php b/_config.php
old mode 100644
new mode 100755
index 0321591..abd6b31
--- a/_config.php
+++ b/_config.php
@@ -1,3 +1,9 @@
 <?php
 
-define('DROPZONE_DIR', basename(dirname(__FILE__)));
\ No newline at end of file
+define('DROPZONE_DIR', basename(dirname(__FILE__)));
+
+// 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');
+}
\ No newline at end of file
diff --git a/code/FileAttachmentField.php b/code/FileAttachmentField.php
old mode 100644
new mode 100755
index 529446f..92eb142
--- a/code/FileAttachmentField.php
+++ b/code/FileAttachmentField.php
@@ -840,7 +840,7 @@ public function upload(SS_HTTPRequest $request) {
               return $this->httpError(400, $user_message);
             }
             if($relationClass = $this->getFileClass($tmpFile['name'])) {
-                $fileObject = Object::create($relationClass);
+                $fileObject = SS_Object::create($relationClass);
             }
 
             try {