Changeset 3717

Timestamp:

04/19/06 03:03:27 (3 years ago)

Author:

ryan

Message:

Move htmlentities2 to functions-formatting.php. #2525

Files:

• trunk/wp-includes/functions-formatting.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions-formatting.php

@@ -1033 +1033 @@
-}
-
+// Borrowed from the PHP Manual user notes. Convert entities, while
+// preserving already-encoded entities:
+function htmlentities2($myHTML) {
+    $translation_table=get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
+    $translation_table[chr(38)] = '&';
+    return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&" , strtr($myHTML, $translation_table));
+}
+
-?>

trunk/wp-includes/functions.php

@@ -1364 +1364 @@
-}
-
-// Borrowed from the PHP Manual user notes. Convert entities, while
-// preserving already-encoded entities:
-function htmlentities2($myHTML) {
-    $translation_table=get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
-    $translation_table[chr(38)] = '&';
-    return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&" , strtr($myHTML, $translation_table));
-}
-
-/*
-add_query_arg: Returns a modified querystring by adding
@@ -1671 +1663 @@
-    return $installed;
-}
+
-?>