From 59f24c3fb2e1e60680f6e3c23b3e7d89f7d14245 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Thu, 19 Oct 2017 00:05:02 +0200
Subject: [PATCH] Bug fixes https://github.com/bludit/bludit/issues/524

---
 bl-kernel/boot/rules/69.pages.php | 6 ++++--
 bl-kernel/url.class.php           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bl-kernel/boot/rules/69.pages.php b/bl-kernel/boot/rules/69.pages.php
index 36887429..c40da023 100644
--- a/bl-kernel/boot/rules/69.pages.php
+++ b/bl-kernel/boot/rules/69.pages.php
@@ -101,8 +101,10 @@ if ($Site->homepage() && $Url->whereAmI()==='home') {
 	}
 }
 
+// The filter blog alway show all the content
+// Change the where am i to use
 if ($Url->whereAmI()==='blog') {
-	$Url->setWhereAmI('home');
+	//$Url->setWhereAmI('home');
 }
 
 // Build specific page
@@ -118,7 +120,7 @@ elseif ($Url->whereAmI()==='category') {
         buildPagesByCategory();
 }
 // Build pages for the homepage
-elseif ($Url->whereAmI()==='home') {
+elseif ( ($Url->whereAmI()==='home') || ($Url->whereAmI()==='blog') ) {
         buildPagesForHome();
 }
 
diff --git a/bl-kernel/url.class.php b/bl-kernel/url.class.php
index f5fb9408..18faaccd 100644
--- a/bl-kernel/url.class.php
+++ b/bl-kernel/url.class.php
@@ -73,7 +73,7 @@ class Url
 				$this->activeFilter = $filterURI;
 
 				if (empty($this->slug) && ($filterName=='blog')) {
-					$this->setWhereAmI('home');
+					$this->setWhereAmI('blog');
 				} elseif (!empty($this->slug) && ($filterName=='blog')) {
 					$this->setNotFound();
 					return false;