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

EZP-29876: New break lines disappear in Richtext while styled with custom styles #34

Merged
merged 3 commits into from
Apr 12, 2019

Conversation

adamwojs
Copy link
Member

@adamwojs adamwojs commented Apr 8, 2019

Question Answer
JIRA issue EZP-29876
Bug/Improvement yes
New feature no
Target version 1.0
BC breaks no
Tests pass yes
Doc needed no

Note for QA: This bugfix depends on #32

TODO:

  • Implement feature / fix a bug.
  • Implement tests.
  • Fix new code according to Coding Standards ($ composer fix-cs).
  • Ask for Code Review.

@adamwojs adamwojs self-assigned this Apr 8, 2019
@adamwojs adamwojs added the Bug Something isn't working label Apr 8, 2019
@adamwojs adamwojs marked this pull request as ready for review April 8, 2019 10:47
@@ -657,6 +657,12 @@
<xsl:apply-templates select="node()|@*"/>
</xsl:template>

<xsl:template match="docbook:eztemplate[@type='style']/docbook:ezcontent/text()">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@type is deprecated, we shouldn't rely on this. If the problem exists it probably applies both to Styles and Tags.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the problem exists it probably applies both to Styles and Tags.

Actually, the problem applies only to Custom Styles. The content of the Custom Tags is one or more block elements (paragraphs, ordered lists, etc) and the line breaks are transformed during processing of those block elements. Nevertheless, fixed in f7b6b1c 😉

@lserwatka
Copy link
Member

@alongosz could you make a final review, we should proceed with QA for 2.5.1

@lserwatka lserwatka merged commit d6cd436 into 1.0 Apr 12, 2019
@lserwatka lserwatka deleted the ezp_29876 branch April 12, 2019 09:24
@lserwatka
Copy link
Member

Could you merge it up?

@adamwojs
Copy link
Member Author

Done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working QA approved
Development

Successfully merging this pull request may close these issues.

4 participants