summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorctrlaltca <>2012-07-28 11:10:14 +0000
committerctrlaltca <>2012-07-28 11:10:14 +0000
commitaf173ae98aff1385e5dc276b293cb41ad4c522f8 (patch)
tree35d8f92b76e2ebb3f532e937e9b511545214e633
parentbb1b020a37785acf824c7c76bf5a1f868e826297 (diff)
fix #418
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/TUrlMapping.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 3dee5567..b426797b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5,6 +5,7 @@ BUG: Issue #413 - TActiveDatePicker does not fire TCallbackClientSide's events (
BUG: Issue #414 - ActiveDatagrid's pager does not fire TCallbackClientSide's events (ctrlaltca)
BUG: Issue #415 - prado-cli throws an error if the application is making use of THttpSession (ctrlaltca)
BUG: Issue #416 - TJsonService reports the wrong content-type (ctrlaltca)
+BUG: Issue #418 - Can't get parameters when friendly url enabled with UrlFormat=Path (sampsa.saarela)
EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca)
EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca)
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 19891da1..93659fb8 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -694,7 +694,7 @@ class TUrlMappingPattern extends TComponent
if ($this->_separator==='/')
{
while($key=array_shift($params))
- $matches2[$key]=($value=array_shift($params)) ? $value : '';
+ $matches[$key]=($value=array_shift($params)) ? $value : '';
}
else
{