summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2007-09-11 05:53:51 +0000
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2007-09-11 05:53:51 +0000
commitd9878de310537cec9c9db889b453b36464aafbe2 (patch)
treee031f4bf2237cb8dc9d24e42099e8fbe29cc6ebe /lib
parentcbdd5e3f0330ebb1433223424adba6af52ea52d5 (diff)
Requirements: document 'htmlentities' dependency-with-fallback
Diffstat (limited to 'lib')
-rw-r--r--lib/rbot/core/utils/utils.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/rbot/core/utils/utils.rb b/lib/rbot/core/utils/utils.rb
index a4f3ab8c..fe073c62 100644
--- a/lib/rbot/core/utils/utils.rb
+++ b/lib/rbot/core/utils/utils.rb
@@ -15,9 +15,9 @@
require 'tempfile'
require 'set'
+# Try to load htmlentities, fall back to an HTML escape table.
begin
require 'htmlentities'
- $we_have_html_entities_decoder = true
rescue LoadError
gems = nil
begin
@@ -28,7 +28,6 @@ rescue LoadError
if gems
retry
else
- $we_have_html_entities_decoder = false
module ::Irc
module Utils
UNESCAPE_TABLE = {
@@ -396,7 +395,7 @@ module ::Irc
def Utils.decode_html_entities(str)
- if $we_have_html_entities_decoder
+ if defined? ::HTMLEntities
return HTMLEntities.decode_entities(str)
else
str.gsub(/(&(.+?);)/) {