Merge pull request #561 from teclator/richtext_license

SlideShow: escape license in plain text. (backport from SP3)
yast · Mar 28, 2017 · ad3082c · ad3082c
2 parents b351fc8 + bbaeb67
commit ad3082c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/library/packages/src/modules/SlideShow.rb b/library/packages/src/modules/SlideShow.rb
@@ -568,7 +568,15 @@ def DetailsPageWidgets
     # @return	A term describing the widgets
     #
     def RelNotesPageWidgets(id)
-      widgets = AddProgressWidgets(:relNotesPage, RichText(@_rn_tabs[id]))
+      # Release notes in plain text need to be escaped to be shown properly (bsc#1028721)
+      rel_notes =
+        if @_rn_tabs[id] =~ /<\/.*>/
+          @_rn_tabs[id]
+        else
+          "<pre>#{String.EscapeTags(@_rn_tabs[id])}</pre>"
+        end
+
+      widgets = AddProgressWidgets(:relNotesPage, RichText(rel_notes))
       Builtins.y2debug("widget term: \n%1", widgets)
       deep_copy(widgets)
     end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 28 10:19:44 WEST 2017 - knut.anderssen@suse.com
+
+- backported
+  - SlideShow: Escape plain text release notes being shown properly
+    in RichText (bsc#1028721).
+- 3.1.215
+
 -------------------------------------------------------------------
 Thu Mar 16 13:48:06 CET 2017 - schubi@suse.de
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.214
+Version:        3.1.215
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0