From 72436b68bf11cc6d5fbddae5d22cf0c816d73b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 12 Jun 2014 12:38:34 +0200 Subject: [PATCH] fix liskov substitution principle in admin mail template settings, fixes #8997 --- apps/files_sharing/appinfo/routes.php | 2 +- apps/files_sharing/controller/adminsettingscontroller.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php index 5b6286e2bf..78d4276f98 100644 --- a/apps/files_sharing/appinfo/routes.php +++ b/apps/files_sharing/appinfo/routes.php @@ -12,7 +12,7 @@ $app = new Sharing(); $app->registerRoutes($this, array('routes' => array( // mailTemplate settings - array('name' => 'admin_settings#render', 'url' => '/settings/mailtemplate', 'verb' => 'GET'), + array('name' => 'admin_settings#render_raw', 'url' => '/settings/mailtemplate', 'verb' => 'GET'), array('name' => 'admin_settings#update', 'url' => '/settings/mailtemplate', 'verb' => 'POST'), diff --git a/apps/files_sharing/controller/adminsettingscontroller.php b/apps/files_sharing/controller/adminsettingscontroller.php index fed3147a99..5192b6239e 100644 --- a/apps/files_sharing/controller/adminsettingscontroller.php +++ b/apps/files_sharing/controller/adminsettingscontroller.php @@ -17,7 +17,7 @@ class AdminSettingsController extends ApiController { * @param string $template * @return \OCA\Files_Sharing\Http\MailTemplateResponse */ - public function render( $theme, $template ) { + public function renderRaw( $theme, $template ) { try { $template = new \OCA\Files_Sharing\MailTemplate( $theme, $template ); return $template->getResponse();