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
27502918
Commit
27502918
authored
Jan 24, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bundle dependency error possibility. fix WSOD in view rendering.
parent
67696d81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
bundle.php
laravel/bundle.php
+2
-4
response.php
laravel/response.php
+10
-1
No files found.
laravel/bundle.php
View file @
27502918
...
...
@@ -46,7 +46,7 @@ class Bundle {
// dependent bundles so that they are available.
if
(
file_exists
(
$path
=
static
::
path
(
$bundle
)
.
'bundle'
.
EXT
))
{
require
$path
;
require
_once
$path
;
}
// Each bundle may also have a "routes" file which is responsible for
...
...
@@ -65,11 +65,9 @@ class Bundle {
*/
public
static
function
routes
(
$bundle
)
{
if
(
static
::
started
(
$bundle
))
return
;
if
(
file_exists
(
$path
=
static
::
path
(
$bundle
)
.
'routes'
.
EXT
))
{
require
$path
;
require
_once
$path
;
}
}
...
...
laravel/response.php
View file @
27502918
...
...
@@ -214,7 +214,16 @@ class Response {
// Since this method is used by both the Route and Controller classes, it is
// a convenient spot to cast the application response to a string before it
// is returned to the main request handler.
$response
->
content
=
(
string
)
$response
->
content
;
$content
=&
$response
->
content
;
if
(
is_object
(
$content
)
and
method_exists
(
$content
,
'__toString'
))
{
$content
=
$content
->
__toString
();
}
else
{
$content
=
(
string
)
$content
;
}
return
$response
;
}
...
...
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