Skip to content

Fix retina flag in XmlFormatLoader11 & add tests for retina flag #3693

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

Merged
merged 2 commits into from
Jan 3, 2018
Merged

Fix retina flag in XmlFormatLoader11 & add tests for retina flag #3693

merged 2 commits into from
Jan 3, 2018

Conversation

wimvds
Copy link
Contributor

@wimvds wimvds commented Dec 19, 2017

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Fixed tickets
Related issues/PRs
License MIT

What's in this PR?

This PR fixes loading of XML file if you set the retina flag to true.

Why?

Because it always set the retina flag to false, instead of using the value from the XML.

@wachterjohannes
Copy link
Member

@wimvds we would like to introduce that in 1.5 & 1.6 could you please change the target to release/1.5 branch?

@wachterjohannes wachterjohannes self-requested a review December 20, 2017 15:43
@wimvds wimvds changed the base branch from develop to release/1.5 December 20, 2017 16:05
@wimvds wimvds changed the base branch from release/1.5 to develop December 20, 2017 16:05
@wimvds wimvds changed the base branch from develop to release/1.5 December 20, 2017 16:26
@wimvds
Copy link
Contributor Author

wimvds commented Dec 20, 2017

Ok, screwed up first by trying to change the base branch via the GitHub UI. Should be ok now :p.

@wachterjohannes
Copy link
Member

@wimvds thanks but could you please fixe the conflicts?

@wimvds
Copy link
Contributor Author

wimvds commented Dec 21, 2017

Done!

@wachterjohannes
Copy link
Member

@wimvds 👍 thanks! one little thing please add following line to CHANGELOG.md:

* dev-release/1.5
    * BUGFIX #3693 [MediaBundle]           Fix retina flag in XmlFormatLoader11 & add tests for retina flag

@wimvds
Copy link
Contributor Author

wimvds commented Jan 2, 2018

Ok, done.

@wachterjohannes wachterjohannes merged commit 8ab980a into sulu:release/1.5 Jan 3, 2018
@wachterjohannes
Copy link
Member

@wimvds thanks for contribution :) this will go into the next release

@wimvds
Copy link
Contributor Author

wimvds commented Jan 3, 2018

Cool! Just noticed it by accident while preparing my presentation on Sulu (while checking the new XML config format), and it was an easy fix.

@wachterjohannes
Copy link
Member

👍

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.

2 participants