]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Inject current template name in templates 1687/head
authorArthurHoaro <arthur@hoa.ro>
Tue, 19 Jan 2021 09:34:11 +0000 (10:34 +0100)
committerArthurHoaro <arthur@hoa.ro>
Tue, 19 Jan 2021 09:34:11 +0000 (10:34 +0100)
Use either legacy key _PAGE_ or new 'template' one.

Related to https://github.com/kalvn/Shaarli-Material/issues/118

application/front/controller/visitor/ShaarliVisitorController.php
tests/front/controller/visitor/ShaarliVisitorControllerTest.php

index ae946c592240bcee977fce824b3073d368064ee6..d3f28f2f7e536ca859049a3b22010eb6b077724e 100644 (file)
@@ -56,6 +56,10 @@ abstract class ShaarliVisitorController
 
     protected function render(string $template): string
     {
+        // Legacy key that used to be injected by PluginManager
+        $this->assignView('_PAGE_', $template);
+        $this->assignView('template', $template);
+
         $this->assignView('linkcount', $this->container->bookmarkService->count(BookmarkFilter::$ALL));
         $this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE));
 
index 935ec24ef7597ad67dcf043176883d3f571f9995..7676f14d5155caf0fcb5d68341bf05ddf84f6d14 100644 (file)
@@ -93,6 +93,9 @@ class ShaarliVisitorControllerTest extends TestCase
 
         static::assertSame('templateName', $render);
 
+        static::assertSame('templateName', $this->assignedValues['_PAGE_']);
+        static::assertSame('templateName', $this->assignedValues['template']);
+
         static::assertSame(10, $this->assignedValues['linkcount']);
         static::assertSame(5, $this->assignedValues['privateLinkcount']);
         static::assertSame(['error'], $this->assignedValues['plugin_errors']);