From be5a8ad517613f3b1e09c4b9578791f3755f42dc Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Wed, 26 Dec 2018 19:17:30 +0100
Subject: [PATCH] redirect /blog to /blog/

---
 bl-kernel/boot/rules/60.router.php | 8 ++++++++
 bl-kernel/site.class.php           | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bl-kernel/boot/rules/60.router.php b/bl-kernel/boot/rules/60.router.php
index 81faeb00..f233c236 100644
--- a/bl-kernel/boot/rules/60.router.php
+++ b/bl-kernel/boot/rules/60.router.php
@@ -5,6 +5,14 @@ if ($url->uri()==HTML_PATH_ROOT.ADMIN_URI_FILTER) {
 	Redirect::url(DOMAIN_ADMIN);
 }
 
+// Redirect blog, from /blog to /blog/
+// This rule only works when the user set a page as homepage
+if ($url->uri()==HTML_PATH_ROOT.'blog' && $site->homepage()) {
+	$filter = $url->filters('blog');
+	$finalURL = Text::addSlashes(DOMAIN_BASE.$filter, false, true);
+	Redirect::url($finalURL);
+}
+
 // Redirect pages, from /my-page/ to /my-page
 if ($url->whereAmI()=='page' && !$url->notFound()) {
 	$pageKey = $url->slug();
diff --git a/bl-kernel/site.class.php b/bl-kernel/site.class.php
index 9e4620b1..8d729d8c 100644
--- a/bl-kernel/site.class.php
+++ b/bl-kernel/site.class.php
@@ -355,7 +355,7 @@ class Site extends dbJSON {
 	public function homepage()
 	{
 		$homepage = $this->getField('homepage');
-		if( empty($homepage) ) {
+		if (empty($homepage)) {
 			return false;
 		}
 		return $homepage;