diff --git a/src/BulkTools/HTTPBulkToolsResponse.php b/src/BulkTools/HTTPBulkToolsResponse.php index 7a2ee3d..a934efd 100644 --- a/src/BulkTools/HTTPBulkToolsResponse.php +++ b/src/BulkTools/HTTPBulkToolsResponse.php @@ -360,12 +360,4 @@ class HTTPBulkToolsResponse extends HTTPResponse $this->createBody(); parent::outputBody(); } - - /** - * @deprecated 3.1.0 This function was used to catch PHP Errors and inject additional information in the response - */ - public function shutdown() - { - // noop - } } diff --git a/src/BulkUploader/BulkUploader.php b/src/BulkUploader/BulkUploader.php index 862e4ff..2097c11 100644 --- a/src/BulkUploader/BulkUploader.php +++ b/src/BulkUploader/BulkUploader.php @@ -5,13 +5,12 @@ namespace Colymba\BulkUpload; use SilverStripe\ORM\DataObject; use SilverStripe\View\ArrayData; -use SilverStripe\Dev\Deprecation; -use SilverStripe\Forms\FormAction; use SilverStripe\View\Requirements; use SilverStripe\Control\Controller; use SilverStripe\Core\Config\Config; use Colymba\BulkUpload\BulkUploadField; use Colymba\BulkUpload\BulkUploadHandler; +use SilverStripe\Control\HTTPRequest; use SilverStripe\Forms\GridField\GridField_URLHandler; use SilverStripe\Forms\GridField\GridField_HTMLProvider; @@ -334,7 +333,7 @@ class BulkUploader implements GridField_HTMLProvider, GridField_URLHandler { $controller = Controller::curr(); $controller->pushCurrent(); - $handler = new \Colymba\BulkUpload\BulkUploadHandler($gridField, $this); + $handler = new BulkUploadHandler($gridField, $this); return $handler->handleRequest($request); }