Skip to content

Ensure compatibility with SS 3.7 & PHP 7.2 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marc-firebrand wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure compatibility with SS 3.7 & PHP 7.2 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion _config.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<?php

define('DROPZONE_DIR', basename(dirname(__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');
}
2 changes: 1 addition & 1 deletion code/FileAttachmentField.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down