-
-
Notifications
You must be signed in to change notification settings - Fork 113
Snippets: do not render snippets from template which is included using includeblock macro #27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
matej21
commented
Sep 2, 2014
- fixes block defined in includeblock template included in snippet doesn't exist for ajax redrawing nette#1510
Contributor
Author
|
But there is an inconsistency I don't like (It was NOT introduced by this commit) if (empty($_l->extends) && !empty($_control->snippetMode) && empty($_g->includingBlock)) {
return Nette\Bridges\ApplicationLatte\UIMacros::renderSnippets($_control, $_b, get_defined_vars());
}
// !!!!! including blocks...
<?php if ($_l->extends) { ob_end_clean(); return $template->renderChildTemplate($_l->extends, get_defined_vars()); }
call_user_func(reset($_b->blocks['content']), $_b, get_defined_vars()) ; so in snippet mode, if template has no layout, blocks won't be included at all. |
d4f8f8f to
b9ada7c
Compare
ab57645 to
3386bd1
Compare
b7c910a to
3f30cee
Compare
b9d4eb3 to
8ca92c7
Compare
Contributor
Author
|
ping @dg |
Member
|
Is it BC break? |
6074ad2 to
81a1a34
Compare
51b53ed to
d36f845
Compare
5f21b0d to
0c73a68
Compare
8e097dc to
e4eb640
Compare
7f051bf to
f87df33
Compare
9725b1d to
9869e52
Compare
18f376d to
3fe619f
Compare
20a93ca to
08cbdeb
Compare
Member
|
@matej21 please can you rebase it, I'll merge it |
4dec1e8 to
606249b
Compare
…ing includeblock macro
606249b to
29c5be3
Compare
Contributor
Author
|
rebased (it is failing because the test depends on nette/latte#34)
I hope it is not :) |
Member
|
Thanks |
dg
added a commit
that referenced
this pull request
Mar 20, 2016
Snippets: do not render snippets from template which is included using includeblock macro
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.