[Tikiwiki-cvs] tiki/lib tikilib.php,1.514.2.214,1.514.2.215

[<to...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13719

Modified Files:
      Tag: BRANCH-1-9
	tikilib.php 
Log Message:
Defines html_entity_decode() case it does not exist for compatibility (itemId=229)


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.514.2.214
retrieving revision 1.514.2.215
diff -u -d -r1.514.2.214 -r1.514.2.215
--- tikilib.php	29 Sep 2005 14:03:46 -0000	1.514.2.214
+++ tikilib.php	5 Oct 2005 19:01:45 -0000	1.514.2.215
@@ -6487,8 +6487,32 @@
 			return false;
 		}
 	}
-
-
+}
+/**
+ * Replace html_entity_decode()
+ *
+ * Borrowed from PEAR:PHP_Compat
+ * @author      David Irvine <da...@co...>
+ * @author      Aidan Lister <ai...@ph...>
+ * @internal    Setting the charset will not do anything
+ */
+if (!function_exists('html_entity_decode')) {
+    function html_entity_decode($string, $quote_style = ENT_COMPAT, $charset = null)
+    {
+        $trans_tbl = get_html_translation_table(HTML_ENTITIES);
+        $trans_tbl = array_flip($trans_tbl);
+
+        // Add single quote to translation table;
+        $trans_tbl['&#039;'] = '\'';
+
+        // Not translating double quotes
+        if ($quote_style & ENT_NOQUOTES) {
+            // Remove double quote from translation table
+            unset($trans_tbl['&quot;']);
+        }
+
+        return strtr($string, $trans_tbl);
+    }
 }