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
c31f001f
Commit
c31f001f
authored
Apr 04, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix url https bug.
parent
e78c90b9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
url.php
laravel/url.php
+5
-1
No files found.
laravel/url.php
View file @
c31f001f
...
@@ -63,7 +63,7 @@ class URL {
...
@@ -63,7 +63,7 @@ class URL {
// If the application's URL configuration is set, we will just use that
// If the application's URL configuration is set, we will just use that
// instead of trying to guess the URL from the $_SERVER array's host
// instead of trying to guess the URL from the $_SERVER array's host
// and script variables as this is
more reliable
.
// and script variables as this is
a more reliable method
.
if
((
$url
=
Config
::
get
(
'application.url'
))
!==
''
)
if
((
$url
=
Config
::
get
(
'application.url'
))
!==
''
)
{
{
$base
=
$url
;
$base
=
$url
;
...
@@ -112,6 +112,10 @@ class URL {
...
@@ -112,6 +112,10 @@ class URL {
{
{
$root
=
preg_replace
(
'~http://~'
,
'https://'
,
$root
,
1
);
$root
=
preg_replace
(
'~http://~'
,
'https://'
,
$root
,
1
);
}
}
else
{
$root
=
preg_replace
(
'~https://~'
,
'http://'
,
$root
,
1
);
}
return
rtrim
(
$root
,
'/'
)
.
'/'
.
ltrim
(
$url
,
'/'
);
return
rtrim
(
$root
,
'/'
)
.
'/'
.
ltrim
(
$url
,
'/'
);
}
}
...
...
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