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

merge 2.2 into 2.x #10442

Merged
merged 8 commits into from
Oct 13, 2016
Merged

merge 2.2 into 2.x #10442

merged 8 commits into from
Oct 13, 2016

Conversation

jdalsem
Copy link
Member

@jdalsem jdalsem commented Oct 13, 2016

No description provided.

jeabakker and others added 8 commits October 11, 2016 11:01
It was assumed a valid entity was provided in the menu hook, this is not
always the case. So now it's validated

fixes: #9371
An action hook was defined, but the callback function doesn't exist.

fixes: #8838
fix(likes): check for a valid entity in menu setup
Menu items in the admin section of the user profile menu could not be
registered as being toggleable, for use of ajax actions

fixes: #9239
…p-undefined-function

chore(uservalidationbyemail): remove registration to undefined function
fix(profile): allow admin menu items to be toggled
fix(blog): correctly check if owner is a group in owner_block menu
@jdalsem jdalsem merged commit d7a5dbd into 2.x Oct 13, 2016
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.

None yet

3 participants