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.

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

Fix EZP-21870: Fatal error when deleting location with limited content/remove permissions #592

Merged
merged 2 commits into from
Nov 1, 2013

Conversation

pspanja
Copy link
Contributor

@pspanja pspanja commented Nov 1, 2013

This PR resolves issue https://jira.ez.no/browse/EZP-21870

Instantiation of LogicalAnd Criterion is fixed and integration test is implemented.

This depends on the fix in #591 and includes complete fix from there.
When #591 is merged this PR will be rebased.

@pspanja
Copy link
Contributor Author

pspanja commented Nov 1, 2013

Rebased after merging #591, IMO this is now ready.

@pspanja
Copy link
Contributor Author

pspanja commented Nov 1, 2013

@andrerom BTW, ok to backport this and #591 to 5.2?

@andrerom
Copy link
Contributor

andrerom commented Nov 1, 2013

+1 (and yes when travis passes it will be ok with backport to 5.2 imho)

pspanja added a commit that referenced this pull request Nov 1, 2013
…land-instantiation

Fix EZP-21870: Fatal error when deleting location with limited content/remove permissions
@pspanja pspanja merged commit 067cb0d into master Nov 1, 2013
@pspanja pspanja deleted the fix-EZP-21870-criterion-logicaland-instantiation branch November 1, 2013 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants