Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
syncEnrollments
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yeray Santana Hualde
syncEnrollments
Commits
023dacf5
Commit
023dacf5
authored
Mar 28, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix replacement of optional parameters in the URL::transpose method.
parent
6bf68aad
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
changes.md
changes.md
+12
-0
url.php
laravel/url.php
+2
-2
No files found.
changes.md
View file @
023dacf5
...
@@ -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
...
...
laravel/url.php
View file @
023dacf5
...
@@ -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
,
'/'
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment