diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2014-06-12 14:33:13 +0200 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2014-06-12 14:33:13 +0200 |
| commit | 354cace14ae01e7ff34af3c8a4a3335b89596da3 (patch) | |
| tree | c1107c64332bb63bc340ab73aa43e58806c1d61b | |
| parent | dff4ad3e00e56d2872d18af067e013e9e50ba8f3 (diff) | |
| parent | 72436b68bf11cc6d5fbddae5d22cf0c816d73b28 (diff) | |
| download | nextcloud-server-354cace14ae01e7ff34af3c8a4a3335b89596da3.tar.gz nextcloud-server-354cace14ae01e7ff34af3c8a4a3335b89596da3.zip | |
Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings
fix liskov substitution principle in admin mail template settings
| -rw-r--r-- | apps/files_sharing/appinfo/routes.php | 2 | ||||
| -rw-r--r-- | 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 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(); |