numeric entities (direction from Gibbo)

scoates · Dec 9, 2009 · 30e4ac3 · 30e4ac3
1 parent 7da0a41
commit 30e4ac3
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/inc/Tokens.php b/inc/Tokens.php
@@ -16,6 +16,12 @@ abstract class Token
         'code','pre',
     );
 
+    protected static $numericEntities = array(
+        '&amp;' => '&#38;',
+        '&lt;' => '&#60;',
+        '&gt;' => '&#62;',
+    );
+
     protected function __construct($text)
     {
         $this->text = $text;
@@ -69,19 +75,11 @@ public function __toString()
 
     public static function ampReplace($str)
     {
-        return str_replace('&amp;','&#38;', htmlentities($str, ENT_NOQUOTES, 'utf-8', false));
-        /*
-        if (strpos($str, '&') === false) {
-            return $str;
-        }
-        $ret = '';
-        foreach (explode('&', $str) as $bit) {
-            if (strpos($str, ';') === false) {
-                $ret .= html
-            }
-        }
-        return str_replace('&','&#38;', $str);
-      */
+        return str_replace(
+            array_keys(self::$numericEntities),
+            array_values(self::$numericEntities),
+            htmlentities($str, ENT_NOQUOTES, 'utf-8', false)
+        );
     }
 }