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.2.5] Fix #1637 #1640

Merged
merged 5 commits into from Dec 5, 2013
Merged

[1.2.5] Fix #1637 #1640

merged 5 commits into from Dec 5, 2013

Conversation

ghost
Copy link

@ghost ghost commented Dec 5, 2013

See #1637

sjinks added 5 commits December 5, 2013 04:19
@sjinks
Test case for #1637
8b0e4df
@sjinks
Use zend_update_property for dynamic properties
c65a19e 
Fix #1637

Conflicts:
	ext/di/injectable.c
@sjinks
Phalcon\Session\Bag fixes
5c35374 
  * initalized => initialized
  * add initialization check to remove()
  * be less aggressive in __construct()
@sjinks
Updated changelog
02f80ed
@sjinks
Regenerated build/
bc3a8ee
phalcon pushed a commit that referenced this pull request Dec 5, 2013
Merge pull request #1640 from sjinks/1.2.5
68a6a2d 
[1.2.5] Fix #1637
@phalcon phalcon merged commit 68a6a2d into phalcon:1.2.5 Dec 5, 2013
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.
3 participants
@niden @phalcon @sjinks