From d9878de310537cec9c9db889b453b36464aafbe2 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Tue, 11 Sep 2007 05:53:51 +0000
Subject: [PATCH] Requirements: document 'htmlentities'
 dependency-with-fallback

---
 REQUIREMENTS                 | 5 +++++
 lib/rbot/core/utils/utils.rb | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/REQUIREMENTS b/REQUIREMENTS
index 74fd26f6..5789d5fc 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -9,8 +9,13 @@ Core requirements
       net/https             (for debian, this will also need libopenssl-ruby)
       socket
       uri
+
+Useful but fallback provided
       ruby-gettext 1.8.0+   http://www.yotabanana.com/hiki/ruby-gettext.html?ruby-gettext
                             optional, if installed rbot can use localized messages     
+      htmlentities          http://htmlentities.rubyforge.org/
+                            optional, if missing rbot will use an internal table to decode
+                            the most common HTML entities
 
 Plugin requirements
 (these are all optional, if you don't have them, the plugins just won't
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(/(&(.+?);)/) {
-- 
2.39.2