Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[1.3.0] Fix #1263 #1271

Merged
merged 3 commits into from Sep 23, 2013
Merged

[1.3.0] Fix #1263 #1271

merged 3 commits into from Sep 23, 2013

Conversation

ghost
Copy link

@ghost ghost commented Sep 22, 2013

See #1263

@sjinks
displayTo() is an alias of setDefault()
9441ef5 
(cherry picked from commit 29c91a1)

Conflicts:
	ext/tag.c
@sjinks
Added \Phalcon\Tag::getAutoescape()
0fbe21d 
(cherry picked from commit 2421a54)
@sjinks
Fix #1263
0aa63b3 
Plus:
  * Improved test case for #1216 (cherry picked from commit cadd87f)
  * Use escaper service instead of phalcon_htmlspecialchars (cherry picked from commit 966332e)
  * Fix #1263 (cherry picked from commit 35fd4ec)
phalcon pushed a commit that referenced this pull request Sep 23, 2013
Merge pull request #1271 from sjinks/issue-1263
731f242 
[1.3.0] Fix #1263
@phalcon phalcon merged commit 731f242 into phalcon:1.3.0 Sep 23, 2013
@ghost ghost deleted the issue-1263 branch September 23, 2013 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phalcon @sjinks