summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-06-12 12:38:34 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-06-12 12:38:34 +0200
commit72436b68bf11cc6d5fbddae5d22cf0c816d73b28 (patch)
tree010f23e9eb873970806c7ccd4f13f0cea770c54c /apps
parent5def2a72dddb92bb2289839054ae39c1850c891d (diff)
downloadnextcloud-server-72436b68bf11cc6d5fbddae5d22cf0c816d73b28.tar.gz
nextcloud-server-72436b68bf11cc6d5fbddae5d22cf0c816d73b28.zip
fix liskov substitution principle in admin mail template settings, fixes #8997
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/appinfo/routes.php2
-rw-r--r--apps/files_sharing/controller/adminsettingscontroller.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 5b6286e2bfb..78d4276f98a 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 fed3147a99c..5192b6239e4 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();