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 #1413 #1420

Merged
merged 2 commits into from Oct 23, 2013
Merged

[1.3.0] Fix #1413 #1420

merged 2 commits into from Oct 23, 2013

Conversation

ghost
Copy link

@ghost ghost commented Oct 22, 2013

See #1413

@sjinks
Test case for #1413
a295c79 
(cherry picked from commit 1c198a6)
@sjinks
Fix #1413
05417fe 
(cherry picked from commit b4938ea)

Conflicts:
	ext/forms/element.c
	ext/tag.c
@phalcon
Copy link
Collaborator

phalcon commented Oct 22, 2013

Is this change intended to avoid throwing an exception in __toString?

@ghost
Copy link
Author

ghost commented Oct 23, 2013

Yes.

If EG(exception) is not null, it extracts the error message from the exception and uses zend_error(E_ERROR) to indicate an error.

phalcon pushed a commit that referenced this pull request Oct 23, 2013
Merge pull request #1420 from sjinks/issue-1413
b941ca0 
[1.3.0] Fix #1413
@phalcon phalcon merged commit b941ca0 into phalcon:1.3.0 Oct 23, 2013
@ghost ghost deleted the issue-1413 branch October 23, 2013 20:44
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