Changeset 13096 for trunk/wp-includes/formatting.php

Timestamp:

02/13/2010 07:28:19 AM (16 years ago)

Author:

nacin

Message:

Deprecate old l10n and sanitization APIs. Deprecate ngettext() for _n(), ngettext_noop() for _n_noop(), translate_with_context() for _x(). Deprecate sanitize_url for esc_url_raw, js_escape for esc_js, wp_specialchars for esc_html, attribute_escape for esc_attr. See #11388

File:

• trunk/wp-includes/formatting.php (modified) (7 diffs)

trunk/wp-includes/formatting.php

@@ -1399 +1399 @@
 }
 
-
 /**
  * Convert one smiley code to the icon graphic file equivalent.
@@ -1429 +1428 @@
     return " <img src='$srcurl' alt='$smiley_masked' class='wp-smiley' /> ";
 }
-
 
 /**
@@ -2227 +2225 @@
 }
 
-
 /**
  * Checks and cleans a URL.
@@ -2262 +2259 @@
  */
 function esc_url_raw( $url, $protocols = null ) {
-    return clean_url( $url, $protocols, 'db' );
-}
-
-/**
- * Performs esc_url() for database or redirect usage.
- *
- * @see esc_url()
- * @deprecated 2.8.0
- *
- * @since 2.3.1
- *
- * @param string $url The URL to be cleaned.
- * @param array $protocols An array of acceptable protocols.
- * @return string The cleaned URL.
- */
-function sanitize_url( $url, $protocols = null ) {
     return clean_url( $url, $protocols, 'db' );
 }
@@ -2319 +2300 @@
 
 /**
- * Escape single quotes, specialchar double quotes, and fix line endings.
- *
- * The filter 'js_escape' is also applied by esc_js()
- *
- * @since 2.0.4
- *
- * @deprecated 2.8.0
- * @see esc_js()
- *
- * @param string $text The text to be escaped.
- * @return string Escaped text.
- */
-function js_escape( $text ) {
-    return esc_js( $text );
-}
-
-/**
  * Escaping for HTML blocks.
  *
@@ -2350 +2314 @@
 
 /**
- * Escaping for HTML blocks
- * @deprecated 2.8.0
- * @see esc_html()
- */
-function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-    if ( func_num_args() > 1 ) { // Maintain backwards compat for people passing additional args
-        $args = func_get_args();
-        return call_user_func_array( '_wp_specialchars', $args );
-    } else {
-        return esc_html( $string );
-    }
-}
-
-/**
  * Escaping for HTML attributes.
  *
@@ -2375 +2325 @@
     $safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
     return apply_filters( 'attribute_escape', $safe_text, $text );
-}
-
-/**
- * Escaping for HTML attributes.
- *
- * @since 2.0.6
- *
- * @deprecated 2.8.0
- * @see esc_attr()
- *
- * @param string $text
- * @return string
- */
-function attribute_escape( $text ) {
-    return esc_attr( $text );
 }