Do not use file as template parameter

Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/core/templates/403.php b/core/templates/403.php
index e053fad764a5fabd981aa2970a7b57ce84cebe4f..72d5d3e4ae63b073c284be467ba66835887431a7 100644 (file)
--- a/core/templates/403.php
+++ b/core/templates/403.php
@@ -12,6 +12,6 @@ if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
 <ul>
        <li class='error'>
                <?php p($l->t( 'Access forbidden' )); ?><br>
-               <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
+               <p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p>
        </li>
 </ul>

diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
index 2eedc39c3aba2cb4570a0368bd742e4bf47ffa6f..87954ccc1cb27bd6c802e70b0d005d528fe3aad8 100644 (file)
--- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
@@ -249,7 +249,7 @@ class SecurityMiddleware extends Middleware {
                                        $url = $this->urlGenerator->linkToRoute('core.login.showLoginForm', $params);
                                        $response = new RedirectResponse($url);
                                } else {
-                                       $response = new TemplateResponse('core', '403', ['file' => $exception->getMessage()], 'guest');
+                                       $response = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest');
                                        $response->setStatus($exception->getCode());
                                }
                        }

diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
index f51f7e9a1c60eb3de05777b5f9b8a066ca077d96..13c5379b142fb186d7a7a36bdd5d060607c57445 100644 (file)
--- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
@@ -568,7 +568,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
                        'test',
                        $exception
                );
-               $expected = new TemplateResponse('core', '403', ['file' => $exception->getMessage()], 'guest');
+               $expected = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest');
                $expected->setStatus($exception->getCode());
                $this->assertEquals($expected , $response);
        }