summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/cgi.rb14
-rw-r--r--lib/delegate.rb2
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 22544d905..bcc3dd900 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -399,7 +399,12 @@ class CGI
end
end
end
-
+ def CGI::escape_html(str)
+ escapeHTML(str)
+ end
+ def CGI::unescape_html(str)
+ unescapeHTML(str)
+ end
# Escape only the tags of certain HTML elements in +string+.
#
@@ -445,7 +450,12 @@ class CGI
string
end
end
-
+ def CGI::escape_element(str)
+ escapeElement(str)
+ end
+ def CGI::unescape_element(str)
+ unescapeElement(str)
+ end
# Format a +Time+ object as a String using the format specified by RFC 1123.
#
diff --git a/lib/delegate.rb b/lib/delegate.rb
index bc200d212..9c89a8cc1 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -73,6 +73,7 @@ class SimpleDelegator<Delegator
end
def __setobj__(obj)
+ raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
@_sd_obj = obj
end
@@ -110,6 +111,7 @@ def DelegateClass(superclass)
@_dc_obj
end
def __setobj__(obj)
+ raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
@_dc_obj = obj
end
def clone