fix Breadcrumb "improvement"

Author: degami

app/base/traits/PageTrait.php

@@ -12,6 +12,8 @@
 namespace App\Base\Traits;
 
 use \App\Base\Abstracts\ContainerAwareObject;
+use \App\Site\Controllers\Frontend\Page;
+use \App\Site\Models\Page as PageModel;
 
 /**
  * Pages Trait
@@ -86,4 +88,23 @@ protected function getTokenData()
 
         return false;
     }
+
+    public function isHomePage()
+    {
+        if ($this instanceof Page) {
+            if ($this->getObject() instanceof PageModel && $this->getObject()->isLoaded()) {
+                $homepage_id = $this->getSiteData()->getHomePageId($this->getSiteData()->getCurrentWebsite(), $this->getObject()->getLocale());
+
+                if ($this->getObject()->getId() == $homepage_id) {
+                    return true;
+                }
+            }
+        }
+
+        if (is_array($this->route_info->getHandler()) && $this->route_info->getHandler()[1] == 'showFrontPage') {
+            return true;
+        }
+
+        return false;
+    }
 }

app/site/blocks/BreadCrumbs.php

@@ -50,7 +50,7 @@ public function renderHTML(BasePage $current_page = null)
             $current_page->getCurrentLocale()
         );
 
-        if (($current_page instanceof Page) && ($current_page->getPageId() != $homepageid)) {
+        if (!$current_page->isHomePage()) {
             $breadcrumbs_links[] = '<a href="'.$home_url.'">'.$this->getUtils()->translate('Home', $locale).'</a>';
         }
 

app/site/controllers/Frontend/Page.php

@@ -40,17 +40,7 @@ public static function getRoutePath()
      */
     protected function getTemplateName()
     {
-        if ($this->getObject() instanceof PageModel && $this->getObject()->isLoaded()) {
-            if (!empty($this->getObject()->getTemplateName())) {
-                return $this->getObject()->getTemplateName();
-            }
-            $homepage_id = $this->getSiteData()->getHomePageId($this->getSiteData()->getCurrentWebsite(), $this->getObject()->getLocale());
-            if ($this->getObject()->getId() == $homepage_id) {
-                return 'homepage';
-            }
-        }
-
-        if (is_array($this->route_info->getHandler()) && $this->route_info->getHandler()[1] == 'showFrontPage') {
+        if ($this->isHomePage()) {
             return 'homepage';
         }