adatpted suggestions

yast · Oct 30, 2020 · a4490b0 · a4490b0
1 parent ef5ad9f
commit a4490b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/package/yast2-ruby-bindings.changes b/package/yast2-ruby-bindings.changes
@@ -3,7 +3,7 @@ Thu Oct 29 11:30:49 UTC 2020 - Stefan Schubert <schubi@suse.com>
 
 - Reporting augeas parsing errors and displaying them in rich-text
   format (bsc#1174198).
-- 4.2.8
+- 4.2.9
 
 -------------------------------------------------------------------
 Wed Jan 22 15:04:11 UTC 2020 - Ancor Gonzalez Sosa <ancor@suse.com>

diff --git a/src/ruby/yast/wfm.rb b/src/ruby/yast/wfm.rb
@@ -6,8 +6,6 @@
 require "yast/yast"
 require "cgi"
 
-include CGI::Escape
-
 # @private we need it as clients is called in global contenxt
 GLOBAL_WFM_CONTEXT = proc {}
 module Yast
@@ -229,8 +227,8 @@ def self.call_builtin_wrapper(*args)
             "<li>YaST made a mistake and wrote invalid syntax earlier." \
             " Please report a YaST bug.</li>" \
             "</ol>"
-      msg + "Caller:  #{escapeHTML(e.backtrace.first)}<br><br>" \
-            "Details: #{escapeHTML(e.message)}"
+      msg + "Caller:  #{CGI::escapeHTML(e.backtrace.first)}<br><br>" \
+            "Details: #{CGI::escapeHTML(e.message)}"
     end
 
     # @param [Exception] e the caught exception
@@ -245,8 +243,8 @@ def self.call_builtin_wrapper(*args)
                "Refer to https://www.suse.com/support/kb/doc?id=7018056.<br><br>"
       end
 
-      msg + "Caller:  #{escapeHTML(e.backtrace.first)}<br><br>" \
-            "Details: #{escapeHTML(e.message)}"
+      msg + "Caller:  #{CGI::escapeHTML(e.backtrace.first)}<br><br>" \
+            "Details: #{CGI::escapeHTML(e.message)}"
     end
 
     # Handles a SignalExpection