[Pkg-owncloud-commits] [owncloud] 44/223: fix liskov substitution principle in admin mail template settings, fixes #8997

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 72436b68bf11cc6d5fbddae5d22cf0c816d73b28
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Thu Jun 12 12:38:34 2014 +0200

    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 5b6286e..78d4276 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 fed3147..5192b62 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git