summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--framework/Web/TUrlMapping.php3
2 files changed, 7 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index 00e86f9c..96951cfb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,7 @@
+Version 3.1.5 (to be released)
+==============================
+BUG: URL wildcard patterns didn't work with subfolders
+
Version 3.1.4 January 11, 2009
==============================
BUG: Issue#9 - Global page properties are ignored when using external configuration (Christophe)
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 7a9628fd..47232401 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -630,6 +630,9 @@ class TUrlMappingPattern extends TComponent
else
preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);
+ if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
+ $matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+
if (isset($matches['urlparams']))
{
$params=explode('/',$matches['urlparams']);