From e864e912d08d3c993606c698e2f474a2a2943070 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Fri, 22 Jun 2012 14:22:22 +0200
Subject: [PATCH] Properly handle the allow_slash parameter for regexes that
 have one or more end-of-string characters.

---
 components/component.router.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/component.router.php b/components/component.router.php
index f688b0d..b145afa 100644
--- a/components/component.router.php
+++ b/components/component.router.php
@@ -63,7 +63,14 @@ class CPHPRouter extends CPHPBaseClass
 				{
 					if($this->allow_slash === true)
 					{
-						$route_regex = "{$route_regex}/?";
+						if(strpos($route_regex, "$") !== false)
+						{
+							$route_regex = str_replace("$", "/?$", $route_regex);
+						}
+						else
+						{
+							$route_regex = "{$route_regex}/?";
+						}
 					}
 					
 					$regex = str_replace("/", "\/", $route_regex);