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
d2fefa65
Commit
d2fefa65
authored
Nov 06, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work on section handling.
parent
49b2d4ab
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
5 deletions
+37
-5
artisan
artisan
+1
-1
changes.md
laravel/documentation/changes.md
+12
-0
view.php
laravel/view.php
+22
-2
paths.php
paths.php
+1
-1
index.php
public/index.php
+1
-1
No files found.
artisan
View file @
d2fefa65
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans
*
*
* @package Laravel
* @package Laravel
* @version 3.2.1
1
* @version 3.2.1
2
* @author Taylor Otwell <taylorotwell@gmail.com>
* @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com
* @link http://laravel.com
*/
*/
...
...
laravel/documentation/changes.md
View file @
d2fefa65
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
## Contents
## Contents
-
[
Laravel 3.2.12
](
#3.2.12
)
-
[
Upgrading From 3.2.11
](
#upgrade-3.2.12
)
-
[
Laravel 3.2.11
](
#3.2.11
)
-
[
Laravel 3.2.11
](
#3.2.11
)
-
[
Upgrading From 3.2.10
](
#upgrade-3.2.11
)
-
[
Upgrading From 3.2.10
](
#upgrade-3.2.11
)
-
[
Laravel 3.2.10
](
#3.2.10
)
-
[
Laravel 3.2.10
](
#3.2.10
)
...
@@ -47,6 +49,16 @@
...
@@ -47,6 +49,16 @@
-
[
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.12"
></a>
## Laravel 3.2.12
-
Clear sections on a complete render operation.
<a
name=
"upgrade-3.2.12"
></a>
### Upgrading From 3.2.11
-
Replace the
**laravel**
folder.
<a
name=
"3.2.11"
></a>
<a
name=
"3.2.11"
></a>
## Laravel 3.2.11
## Laravel 3.2.11
...
...
laravel/view.php
View file @
d2fefa65
...
@@ -51,6 +51,13 @@ class View implements ArrayAccess {
...
@@ -51,6 +51,13 @@ class View implements ArrayAccess {
*/
*/
public
static
$last
;
public
static
$last
;
/**
* The render operations taking place.
*
* @var int
*/
public
static
$render_count
=
0
;
/**
/**
* The Laravel view loader event name.
* The Laravel view loader event name.
*
*
...
@@ -327,8 +334,12 @@ class View implements ArrayAccess {
...
@@ -327,8 +334,12 @@ class View implements ArrayAccess {
*/
*/
public
function
render
()
public
function
render
()
{
{
static
::
$render_count
++
;
Event
::
fire
(
"laravel.composing:
{
$this
->
view
}
"
,
array
(
$this
));
Event
::
fire
(
"laravel.composing:
{
$this
->
view
}
"
,
array
(
$this
));
$contents
=
null
;
// If there are listeners to the view engine event, we'll pass them
// If there are listeners to the view engine event, we'll pass them
// the view so they can render it according to their needs, which
// the view so they can render it according to their needs, which
// allows easy attachment of other view parsers.
// allows easy attachment of other view parsers.
...
@@ -336,10 +347,19 @@ class View implements ArrayAccess {
...
@@ -336,10 +347,19 @@ class View implements ArrayAccess {
{
{
$result
=
Event
::
until
(
static
::
engine
,
array
(
$this
));
$result
=
Event
::
until
(
static
::
engine
,
array
(
$this
));
if
(
!
is_null
(
$result
))
return
$result
;
if
(
!
is_null
(
$result
))
$contents
=
$result
;
}
if
(
is_null
(
$contents
))
$contents
=
$this
->
get
();
static
::
$render_count
--
;
if
(
static
::
$render_count
==
0
)
{
Section
::
$sections
=
array
();
}
}
return
$
this
->
get
()
;
return
$
contents
;
}
}
/**
/**
...
...
paths.php
View file @
d2fefa65
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans
*
*
* @package Laravel
* @package Laravel
* @version 3.2.1
1
* @version 3.2.1
2
* @author Taylor Otwell <taylorotwell@gmail.com>
* @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com
* @link http://laravel.com
*/
*/
...
...
public/index.php
View file @
d2fefa65
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans
*
*
* @package Laravel
* @package Laravel
* @version 3.2.1
1
* @version 3.2.1
2
* @author Taylor Otwell <taylorotwell@gmail.com>
* @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com
* @link http://laravel.com
*/
*/
...
...
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