<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13096] trunk/wp-includes: Deprecate old l10n and sanitization APIs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13096">13096</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-13 07:28:19 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/11388">#11388</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (13095 => 13096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-02-13 07:09:04 UTC (rev 13095)
+++ trunk/wp-includes/deprecated.php 2010-02-13 07:28:19 UTC (rev 13096)
</span><span class="lines">@@ -1862,10 +1862,29 @@
</span><span class="cx"> */
</span><span class="cx"> function _c( $text, $domain = 'default' ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '2.9', '_x()' );
</span><del>- return translate_with_context( $text, $domain );
</del><ins>+ return before_last_bar( translate( $text, $domain ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Translates $text like translate(), but assumes that the text
+ * contains a context after its last vertical bar.
+ *
+ * @since 2.5
+ * @uses translate()
+ * @deprecated 3.0.0
+ * @deprecated Use _x()
+ * @see _x()
+ *
+ * @param string $text Text to translate
+ * @param string $domain Domain to retrieve the translated text
+ * @return string Translated text
+ */
+function translate_with_context( $text, $domain = 'default' ) {
+ _deprecated_function( __FUNCTION__, '2.9', '_x()' );
+ return before_last_bar( translate( $text, $domain ) );
+}
+
+/**
</ins><span class="cx"> * A version of _n(), which supports contexts.
</span><span class="cx"> * Strips everything from the translation after the last bar.
</span><span class="cx"> *
</span><span class="lines">@@ -1883,6 +1902,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Retrieve the plural or single form based on the amount.
+ *
+ * @since 1.2.0
+ * @deprecated 2.8.0
+ * @deprecated Use _n()
+ * @see _n()
+ */
+function __ngettext() {
+ _deprecated_function( __FUNCTION__, '2.8', '_n()' );
+ $args = func_get_args();
+ return call_user_func_array('_n', $args);
+}
+
+/**
+ * Register plural strings in POT file, but don't translate them.
+ *
+ * @since 2.5
+ * @deprecated 2.8.0
+ * @deprecated Use _n_noop()
+ * @see _n_noop()
+ */
+function __ngettext_noop() {
+ _deprecated_function( __FUNCTION__, '2.8', '_n_noop()' );
+ $args = func_get_args();
+ return call_user_func_array('_n_noop', $args);
+
+}
+
+/**
</ins><span class="cx"> * Retrieve all autoload options, or all options if no autoloaded ones exist.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span><span class="lines">@@ -2074,4 +2122,73 @@
</span><span class="cx"> return get_bookmark($bookmark_id, $output, $filter);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><ins>+/**
+ * Performs esc_url() for database or redirect usage.
+ *
+ * @since 2.3.1
+ * @deprecated 2.8.0
+ * @deprecated Use esc_url_raw()
+ * @see esc_url_raw()
+ *
+ * @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 ) {
+ _deprecated_function( __FUNCTION__, '2.8', 'esc_url_raw()' );
+ return clean_url( $url, $protocols, 'db' );
+}
+
+/**
+ * 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
+ * @deprecated Use esc_js()
+ * @see esc_js()
+ *
+ * @param string $text The text to be escaped.
+ * @return string Escaped text.
+ */
+function js_escape( $text ) {
+ _deprecated_function( __FUNCTION__, '2.8', 'esc_js()' );
+ return esc_js( $text );
+}
+
+/**
+ * Escaping for HTML blocks.
+ *
+ * @deprecated 2.8.0
+ * @deprecated Use esc_html()
+ * @see esc_html()
+ */
+function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
+ _deprecated_function( __FUNCTION__, '2.8', 'esc_html()' );
+ 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.
+ *
+ * @since 2.0.6
+ * @deprecated 2.8.0
+ * @deprecated Use esc_attr()
+ * @see esc_attr()
+ *
+ * @param string $text
+ * @return string
+ */
+function attribute_escape( $text ) {
+ _deprecated_function( __FUNCTION__, '2.8', 'esc_attr()' );
+ return esc_attr( $text );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (13095 => 13096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-02-13 07:09:04 UTC (rev 13095)
+++ trunk/wp-includes/formatting.php 2010-02-13 07:28:19 UTC (rev 13096)
</span><span class="lines">@@ -1398,7 +1398,6 @@
</span><span class="cx"> return "<a $text rel=\"nofollow\">";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Convert one smiley code to the icon graphic file equivalent.
</span><span class="cx"> *
</span><span class="lines">@@ -1429,7 +1428,6 @@
</span><span class="cx"> return " <img src='$srcurl' alt='$smiley_masked' class='wp-smiley' /> ";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Convert text equivalent of smilies to images.
</span><span class="cx"> *
</span><span class="lines">@@ -2226,7 +2224,6 @@
</span><span class="cx"> return $wpdb->escape( $sql );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Checks and cleans a URL.
</span><span class="cx"> *
</span><span class="lines">@@ -2265,22 +2262,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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' );
-}
-
-/**
</del><span class="cx"> * Convert entities, while preserving already-encoded entities.
</span><span class="cx"> *
</span><span class="cx"> * @link http://www.php.net/htmlentities Borrowed from the PHP Manual user notes.
</span><span class="lines">@@ -2318,23 +2299,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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 );
-}
-
-/**
</del><span class="cx"> * Escaping for HTML blocks.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="lines">@@ -2349,20 +2313,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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 );
- }
-}
-
-/**
</del><span class="cx"> * Escaping for HTML attributes.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="lines">@@ -2377,21 +2327,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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 );
-}
-
-/**
</del><span class="cx"> * Escape a HTML tag name.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (13095 => 13096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-02-13 07:09:04 UTC (rev 13095)
+++ trunk/wp-includes/l10n.php 2010-02-13 07:28:19 UTC (rev 13096)
</span><span class="lines">@@ -77,21 +77,6 @@
</span><span class="cx"> return substr( $string, 0, $last_bar );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * Translates $text like translate(), but assumes that the text
- * contains a context after its last vertical bar.
- *
- * @since 2.5
- * @uses translate()
- *
- * @param string $text Text to translate
- * @param string $domain Domain to retrieve the translated text
- * @return string Translated text
- */
-function translate_with_context( $text, $domain = 'default' ) {
- return before_last_bar( translate( $text, $domain ) );
-}
-
</del><span class="cx"> function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
</span><span class="cx"> $translations = &get_translations_for_domain( $domain );
</span><span class="cx"> return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain );
</span><span class="lines">@@ -192,16 +177,15 @@
</span><span class="cx"> * found in more than two places but with different translated context.
</span><span class="cx"> *
</span><span class="cx"> * By including the context in the pot file translators can translate the two
</span><del>- * string differently
</del><ins>+ * string differently.
</ins><span class="cx"> *
</span><del>- * @since 2.8
</del><ins>+ * @since 2.8.0
</ins><span class="cx"> *
</span><span class="cx"> * @param string $text Text to translate
</span><span class="cx"> * @param string $context Context information for the translators
</span><span class="cx"> * @param string $domain Optional. Domain to retrieve the translated text
</span><span class="cx"> * @return string Translated context string without pipe
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> function _x( $single, $context, $domain = 'default' ) {
</span><span class="cx"> return translate_with_gettext_context( $single, $context, $domain );
</span><span class="cx"> }
</span><span class="lines">@@ -214,12 +198,6 @@
</span><span class="cx"> return esc_html( translate_with_gettext_context( $single, $context, $domain ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function __ngettext() {
- _deprecated_function( __FUNCTION__, '2.8', '_n()' );
- $args = func_get_args();
- return call_user_func_array('_n', $args);
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * Retrieve the plural or single form based on the amount.
</span><span class="cx"> *
</span><span class="lines">@@ -231,7 +209,7 @@
</span><span class="cx"> * to the 'ngettext' filter hook along with the same parameters. The expected
</span><span class="cx"> * type will be a string.
</span><span class="cx"> *
</span><del>- * @since 1.2.0
</del><ins>+ * @since 2.8.0
</ins><span class="cx"> * @uses $l10n Gets list of domain translated string (gettext_reader) objects
</span><span class="cx"> * @uses apply_filters() Calls 'ngettext' hook on domains text returned,
</span><span class="cx"> * along with $single, $plural, and $number parameters. Expected to return string.
</span><span class="lines">@@ -262,16 +240,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @deprecated Use _n_noop()
- */
-function __ngettext_noop() {
- _deprecated_function( __FUNCTION__, '2.8', '_n_noop()' );
- $args = func_get_args();
- return call_user_func_array('_n_noop', $args);
-
-}
-
-/**
</del><span class="cx"> * Register plural strings in POT file, but don't translate them.
</span><span class="cx"> *
</span><span class="cx"> * Used when you want do keep structures with translatable plural strings and
</span><span class="lines">@@ -304,7 +272,6 @@
</span><span class="cx"> return array( $single, $plural, $context );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Loads a MO file into the domain $domain.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>