Commit 023dacf5 authored by Taylor Otwell's avatar Taylor Otwell

fix replacement of optional parameters in the URL::transpose method.

parent 6bf68aad
...@@ -2,11 +2,23 @@ ...@@ -2,11 +2,23 @@
## Contents ## Contents
- [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2)
- [Laravel 3.1.1](#3.1.1) - [Laravel 3.1.1](#3.1.1)
- [Upgrading From 3.1](#upgrade-3.1.1) - [Upgrading From 3.1](#upgrade-3.1.1)
- [Laravel 3.1](#3.1) - [Laravel 3.1](#3.1)
- [Upgrading From 3.0](#upgrade-3.1) - [Upgrading From 3.0](#upgrade-3.1)
<a name="3.2"></a>
## Laravel 3.2
- Fixed replacement of optional parameters in URL::transpose method.
<a name="upgrade-3.2"></a>
## Upgrading From 3.1
- Replace the **laravel** folder.
<a name="3.1.1"></a> <a name="3.1.1"></a>
## Laravel 3.1.1 ## Laravel 3.1.1
......
...@@ -304,8 +304,8 @@ class URL { ...@@ -304,8 +304,8 @@ class URL {
// If there are any remaining optional place-holders, we'll just replace // If there are any remaining optional place-holders, we'll just replace
// them with empty strings since not every optional parameter has to be // them with empty strings since not every optional parameter has to be
// in the array of parameters that were passed. // in the array of parameters that were passed to us.
$uri = str_replace(array_keys(Router::$optional), '', $uri); $uri = preg_replace('/\(.+?\)/', '', $uri);
return trim($uri, '/'); return trim($uri, '/');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment