From 04a195b1116fb3caf9db2026477d0186120224db Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 9 Mar 2012 23:20:09 +0100 Subject: [PATCH] MINOR Stop using FormResponse, which has been removed from core --- code/controllers/AssetAdmin.php | 8 ++++---- code/controllers/ReportAdmin.php | 4 ++-- code/model/ErrorPage.php | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index c72f09ca..57f875c1 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -445,8 +445,8 @@ JS */ public function doSync() { $message = Filesystem::sync(); - FormResponse::status_message($message, 'good'); - echo FormResponse::respond(); + $this->response->addHeader('X-Status', $message); + return; } /** @@ -474,8 +474,8 @@ JS } $message = sprintf(_t('AssetAdmin.THUMBSDELETED', '%s unused thumbnails have been deleted'), $count); - FormResponse::status_message($message, 'good'); - echo FormResponse::respond(); + $this->response->addHeader('X-Status', $message); + return; } /** diff --git a/code/controllers/ReportAdmin.php b/code/controllers/ReportAdmin.php index fdbb4d75..8e3f370e 100644 --- a/code/controllers/ReportAdmin.php +++ b/code/controllers/ReportAdmin.php @@ -94,8 +94,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider { } public function updatereport() { - FormResponse::load_form($this->EditForm()->forTemplate()); - return FormResponse::respond(); + // FormResponse::load_form($this->EditForm()->forTemplate()); + // return FormResponse::respond(); } function providePermissions() { diff --git a/code/model/ErrorPage.php b/code/model/ErrorPage.php index 33aecfc8..0cd7342d 100644 --- a/code/model/ErrorPage.php +++ b/code/model/ErrorPage.php @@ -209,9 +209,8 @@ class ErrorPage extends Page { ), $errorFile ); - FormResponse::status_message($fileErrorText, 'bad'); - FormResponse::respond(); - return; + $this->response->addHeader('X-Status', $fileErrorText); + return $this->httpError(405); } }