1.0.8, check changelog

heimrichhannot · Mar 9, 2018 · 6f17f3c · 6f17f3c
1 parent 21ead3f
commit 6f17f3c
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/EventListener/HookListener.php b/src/EventListener/HookListener.php
@@ -37,26 +37,30 @@ class HookListener
      */
     public function __construct(ContaoFrameworkInterface $framework, TagManager $tagManager)
     {
-        $this->framework = $framework;
+        $this->framework  = $framework;
         $this->tagManager = $tagManager;
     }
 
     /**
      * Modify the page object.
-     *
+     * @param PageModel $page
+     * @param LayoutModel $layout
      * @param PageRegular $pageRegular
+     *
      */
-    public function generatePage(PageRegular $pageRegular)
+    public function generatePage(PageModel $page, LayoutModel $layout, PageRegular $pageRegular)
     {
         $pageRegular->Template->meta = implode("\n", $this->tagManager->getTags());
     }
 
     /**
      * Modify the page layout.
      *
+     * @param PageModel $page
      * @param LayoutModel $layout
+     * @param PageRegular $pageRegular
      */
-    public function getPageLayout(LayoutModel $layout)
+    public function getPageLayout(PageModel $page, LayoutModel $layout, PageRegular $pageRegular)
     {
         /*
          * @var $objPage \Contao\PageModel
@@ -69,11 +73,11 @@ public function getPageLayout(LayoutModel $layout)
         // Fall back to the default title tag
         if ('' === $layout->titleTag) {
             $objFirstPage = PageModel::findFirstPublishedByPid($objPage->rootId);
-            $strTitle = '{{page::rootPageTitle}}';
+            $strTitle     = '{{page::rootPageTitle}}';
 
             // add pageTitle only if not first page / front page)
             if (null === $objFirstPage || $objFirstPage->id !== $objPage->id) {
-                $strTitle = '{{page::pageTitle}} - '.$strTitle;
+                $strTitle = '{{page::pageTitle}} - ' . $strTitle;
             }
 
             $layout->titleTag = $strTitle;
@@ -86,7 +90,7 @@ public function getPageLayout(LayoutModel $layout)
         System::getContainer()->get('huh.head.tag.meta_robots')->setContent($objPage->robots ?: 'index,follow');
 
         $path = Request::createFromGlobals()->getPathInfo(); // path without query string
-        $url = Environment::get('url').$path;
+        $url  = Environment::get('url') . $path;
 
         // if path is id, take absolute url from current page
         if (is_numeric(ltrim($path, '/'))) {