html_translation_table()-related fixes

Author: brettz9

functions/strings/get_html_translation_table.js

@@ -34,17 +34,6 @@ function get_html_translation_table(table, quote_style) {
         // return false;
     }
 
-    // ascii decimals for better compatibility
-    entities['38'] = '&';
-    if (useQuoteStyle !== 'ENT_NOQUOTES') {
-        entities['34'] = '"';
-    }
-    if (useQuoteStyle === 'ENT_QUOTES') {
-        entities['39'] = ''';
-    }
-    entities['60'] = '<';
-    entities['62'] = '>';
-
     if (useTable === 'HTML_ENTITIES') {
         entities['160'] = ' ';
         entities['161'] = '¡';
@@ -143,7 +132,19 @@ function get_html_translation_table(table, quote_style) {
         entities['254'] = 'þ';
         entities['255'] = 'ÿ';
     }
-    
+
+    if (useQuoteStyle !== 'ENT_NOQUOTES') {
+        entities['34'] = '"';
+    }
+    if (useQuoteStyle === 'ENT_QUOTES') {
+        entities['39'] = ''';
+    }
+    entities['60'] = '<';
+    entities['62'] = '>';
+
+    // ascii decimals for better compatibility
+    entities['38'] = '&';
+
     // ascii decimals to real symbols
     for (decimal in entities) {
         symbol = String.fromCharCode(decimal);

functions/strings/html_entity_decode.js

@@ -20,14 +20,11 @@ function html_entity_decode( string, quote_style ) {
         return false;
     }
 
-    // & must be the last character when decoding!
-    delete(histogram['&']);
-    histogram['&'] = '&';
-
     for (symbol in histogram) {
         entity = histogram[symbol];
         tmp_str = tmp_str.split(entity).join(symbol);
     }
+    tmp_str = tmp_str.split(''').join("'");
 
     return tmp_str;
 }

functions/strings/htmlentities.js

@@ -18,7 +18,7 @@ function htmlentities (string, quote_style) {
     if (false === (histogram = this.get_html_translation_table('HTML_ENTITIES', quote_style))) {
         return false;
     }
-    
+    histogram["'"] = ''';
     for (symbol in histogram) {
         entity = histogram[symbol];
         tmp_str = tmp_str.split(symbol).join(entity);

functions/strings/htmlspecialchars.js

@@ -16,6 +16,7 @@ function htmlspecialchars (string, quote_style) {
         return false;
     }
 
+    histogram["'"] = ''';
     for (symbol in histogram) {
         entity = histogram[symbol];
         tmp_str = tmp_str.split(symbol).join(entity);

functions/strings/htmlspecialchars_decode.js

@@ -20,14 +20,11 @@ function htmlspecialchars_decode(string, quote_style) {
         return false;
     }
 
-    // & must be the last character when decoding!
-    delete(histogram['&']);
-    histogram['&'] = '&';
-
     for (symbol in histogram) {
         entity = histogram[symbol];
         tmp_str = tmp_str.split(entity).join(symbol);
     }
+    tmp_str = tmp_str.split(''').join("'");
 
     return tmp_str;
 }