From 015fe6bbfcda351625ad9080943e2ca2f9fadf0c Mon Sep 17 00:00:00 2001
From: secretr <m.yovchev@gmail.com>
Date: Tue, 29 Nov 2011 07:01:58 +0000
Subject: [PATCH] forum url config fix - index/index route
---
e107_plugins/forum/e_url.php | 4 +++-
e107_plugins/forum/url/rewrite/e_url.php | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/e107_plugins/forum/e_url.php b/e107_plugins/forum/e_url.php
index dda35fd3a..37471e5e9 100644
--- a/e107_plugins/forum/e_url.php
+++ b/e107_plugins/forum/e_url.php
@@ -36,9 +36,10 @@ class plugin_forum_url extends eUrlConfig
{
$amp = varset($options['encode']) ? '&' : '&';
if(is_string($route)) $route = explode('/', $route, 2);
- if(!varset($route[0])) $route[0] = 'forum';
+ if(!varset($route[0]) || 'index' == $route[0]) $route[0] = 'forum';
if(!varset($route[1])) $route[1] = 'main';
$base = e107::getInstance()->getFolder('plugins').'forum/';
+
//var_dump($options, $route, $params);
if($route[0] == 'forum')
{
@@ -55,6 +56,7 @@ class plugin_forum_url extends eUrlConfig
return $base.'forum.php?track';
break;
+ case 'index':
case 'main':
return $base.'forum.php';
break;
diff --git a/e107_plugins/forum/url/rewrite/e_url.php b/e107_plugins/forum/url/rewrite/e_url.php
index d2e1e2d0e..540ff2cc4 100644
--- a/e107_plugins/forum/url/rewrite/e_url.php
+++ b/e107_plugins/forum/url/rewrite/e_url.php
@@ -36,7 +36,7 @@ class plugin_forum_rewrite_url extends eUrlConfig
{
$amp = varset($options['encode']) ? '&' : '&';
if(is_string($route)) $route = explode('/', $route, 2);
- if(!varset($route[0])) $route[0] = 'forum';
+ if(!varset($route[0]) || 'index' == $route[0]) $route[0] = 'forum';
if(!varset($route[1])) $route[1] = 'main';
$base = e107::getInstance()->getFolder('plugins').'forum/';
//var_dump($options, $route, $params);
@@ -54,7 +54,8 @@ class plugin_forum_rewrite_url extends eUrlConfig
case 'track':
return $base.'forum.php?track';
break;
-
+
+ case 'index':
case 'main':
return $base.'forum.php';
break;