Router: Regular expressions for feed URLs has been combined.

1 files changed, 2 insertions, 14 deletions

diff --git a/index.php b/index.php
index 360bd4d..0697ed3 100644
--- a/index.php
+++ b/index.php
@@ -49,14 +49,7 @@ Router::add('', function() {
 #===============================================================================
 # ROUTE: Feed
 #===============================================================================
-Router::add('feed/', function() {
-	require 'core/include/feed/main.php';
-});
-
-#===============================================================================
-# ROUTE: Feed [item type only]
-#===============================================================================
-Router::add('feed/(page|post)/', function($param) {
+Router::add('feed/(?:(page|post)/)?', function($param = NULL) {
 	require 'core/include/feed/main.php';
 });
 
@@ -70,12 +63,7 @@ Router::add('search/', function() {
 #===============================================================================
 # REDIRECT: Feed (trailing slash)
 #===============================================================================
-Router::addRedirect('feed', Application::getURL('feed/'));
-
-#===============================================================================
-# REDIRECT: Feed [posts or pages] (trailing slash)
-#===============================================================================
-Router::addRedirect('feed/(page|post)', Application::getURL('feed/$1/'));
+Router::addRedirect('feed(/(?:page|post))?', Application::getURL('feed$1/'));
 
 #===============================================================================
 # REDIRECT: Search (trailing slash)