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

Reattempt 8024 #8583

Merged
merged 2 commits into from Dec 4, 2015
Merged

Reattempt 8024 #8583

merged 2 commits into from Dec 4, 2015

Conversation

mbabker
Copy link
Contributor

@mbabker mbabker commented Dec 2, 2015

This fixes the bad merge of #8024 by reverting 88fb40b and reapplying the diff from the pull request.

@infograf768
Copy link
Member

What shall we check for when testing?

@Bakual
Copy link
Contributor

Bakual commented Dec 3, 2015

@wilsonge @roland-d As you were involved in the original merge, please review.

@mbabker
Copy link
Contributor Author

mbabker commented Dec 3, 2015

What shall we check for when testing?

This should be mostly review and validation that things are in the same state they were before the reverted commit. The diff shows a majority of the changes are code style related or replacing calls to the deprecated $app->getCfg()

@roland-d
Copy link
Contributor

roland-d commented Dec 4, 2015

@mbabker Thanks for the PR, I have reviewed the changes and they look good to me. @wilsonge You want to go over it as well? After that we can merge this if all looks good to you.

wilsonge added a commit that referenced this pull request Dec 4, 2015
@wilsonge wilsonge merged commit d978f66 into joomla:staging Dec 4, 2015
@wilsonge
Copy link
Contributor

wilsonge commented Dec 4, 2015

Merged on review

@mbabker mbabker deleted the reattempt-8024 branch December 4, 2015 21:05
@zero-24 zero-24 added this to the Joomla! 3.5.0 milestone Dec 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants