<!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>[12584] trunk: Updates and improvements to _depreceated_argument.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12584">12584</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-30 16:23:39 +0000 (Wed, 30 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updates and improvements to _depreceated_argument. See <a href="http://trac.wordpress.org/ticket/11386">#11386</a> props nacin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesauthortemplatephp">trunk/wp-includes/author-template.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludescronphp">trunk/wp-includes/cron.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-admin/includes/image.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -17,9 +17,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $file Filename of the original image, Or attachment id.
</span><span class="cx"> * @param int $max_side Maximum length of a single side for the thumbnail.
</span><ins>+ * @param mixed $deprecated Not used.
</ins><span class="cx"> * @return string Thumbnail path on success, Error string on failure.
</span><span class="cx"> */
</span><span class="cx"> function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx"> $thumbpath = image_resize( $file, $max_side, $max_side );
</span><span class="cx"> return apply_filters( 'wp_create_thumbnail', $thumbpath );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-admin/includes/meta-boxes.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -639,6 +639,9 @@
</span><span class="cx"> function xfn_check($class, $value = '', $deprecated = '') {
</span><span class="cx"> global $link;
</span><span class="cx">
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
</span><span class="cx"> $rels = preg_split('/\s+/', $link_rel);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-admin/includes/upgrade.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -33,9 +33,12 @@
</span><span class="cx"> * @param null $deprecated Optional. Not used.
</span><span class="cx"> * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
</span><span class="cx"> */
</span><del>-function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
</del><ins>+function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '' ) {
</ins><span class="cx"> global $wp_rewrite;
</span><span class="cx">
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.6' );
+
</ins><span class="cx"> wp_check_mysql_version();
</span><span class="cx"> wp_cache_flush();
</span><span class="cx"> make_db_current_silent();
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-app.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -884,10 +884,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> *
</span><del>- * @param mixed $deprecated Optional, not used.
</del><ins>+ * @param mixed $deprecated Not used.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_categories_url($deprecated = '') {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.5' );
</ins><span class="cx"> return $this->app_base . $this->CATEGORIES_PATH;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesauthortemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/author-template.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/author-template.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/author-template.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -22,6 +22,10 @@
</span><span class="cx"> */
</span><span class="cx"> function get_the_author($deprecated = '') {
</span><span class="cx"> global $authordata;
</span><ins>+
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,11 +48,9 @@
</span><span class="cx"> * @param string $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it.
</span><span class="cx"> * @return string The author's display name, from get_the_author().
</span><span class="cx"> */
</span><del>-function the_author($deprecated = '', $deprecated_echo = true) {
- if ( !empty($deprecated) )
- _deprecated_argument(__FUNCTION__, 'deprecated', '1.5');
- if ( $deprecated_echo !== true )
- _deprecated_argument(__FUNCTION__, 'deprecated_echo', '1.5', __('Use get_the_author() instead if you do not want the value echoed.'));
</del><ins>+function the_author( $deprecated = '', $deprecated_echo = true ) {
+ if ( !empty( $deprecated ) || $deprecated_echo !== true )
+ _deprecated_argument( __FUNCTION__, '1.5', $deprecated_echo !== true ? __('Use get_the_author() instead if you do not want the value echoed.') : null );
</ins><span class="cx"> if ( $deprecated_echo )
</span><span class="cx"> echo get_the_author();
</span><span class="cx"> return get_the_author();
</span><span class="lines">@@ -182,7 +184,7 @@
</span><span class="cx"> */
</span><span class="cx"> function the_author_posts_link($deprecated = '') {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument(__FUNCTION__, 'deprecated', '0.0');
</del><ins>+ _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx">
</span><span class="cx"> global $authordata;
</span><span class="cx"> $link = sprintf(
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/comment-template.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -503,15 +503,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><del>- * @param string $deprecated_1 Not Used
- * @param bool $deprecated_2 Not Used
</del><ins>+ * @param string $deprecated Not Used
+ * @param bool $deprecated Not Used
</ins><span class="cx"> */
</span><del>-function comments_link( $deprecated_1 = '', $deprecated_2 = '' ) {
- if ( !empty( $deprecated_1 ) )
- _deprecated_argument(__FUNCTION__, 'deprecated_1', '0.0');
- if ( !empty( $deprecated_2 ) )
- _deprecated_argument(__FUNCTION__, 'deprecated_2', '0.0');
-
</del><ins>+function comments_link( $deprecated = '', $deprecated = '' ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx"> echo get_comments_link();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -554,6 +551,10 @@
</span><span class="cx"> */
</span><span class="cx"> function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
</span><span class="cx"> global $id;
</span><ins>+
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> $number = get_comments_number($id);
</span><span class="cx">
</span><span class="cx"> if ( $number > 1 )
</span><span class="lines">@@ -696,12 +697,16 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @uses get_trackback_url() Gets the trackback url for the current post
</span><span class="cx"> *
</span><del>- * @param bool $deprecated Remove backwards compat in 2.5
</del><ins>+ * @param bool $deprecated_echo Remove backwards compat in 2.5
</ins><span class="cx"> * @return void|string Should only be used to echo the trackback URL, use get_trackback_url() for the result instead.
</span><span class="cx"> */
</span><del>-function trackback_url($deprecated = true) {
- if ($deprecated) echo get_trackback_url();
- else return get_trackback_url();
</del><ins>+function trackback_url( $deprecated_echo = true ) {
+ if ( $deprecated_echo !== true )
+ _deprecated_argument( __FUNCTION__, '2.5', __('Use get_trackback_url() instead if you do not want the value echoed.') );
+ if ( $deprecated_echo )
+ echo get_trackback_url();
+ else
+ return get_trackback_url();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -712,6 +717,9 @@
</span><span class="cx"> * @param int $deprecated Not used (Was $timezone = 0)
</span><span class="cx"> */
</span><span class="cx"> function trackback_rdf($deprecated = '') {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.5' );
+
</ins><span class="cx"> if (stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') === false) {
</span><span class="cx"> echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
</span><span class="cx"> xmlns:dc="http://purl.org/dc/elements/1.1/"
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/comment.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -1511,9 +1511,9 @@
</span><span class="cx"> * @param int $deprecated Not Used.
</span><span class="cx"> * @return bool|string False on failure, string containing URI on success.
</span><span class="cx"> */
</span><del>-function discover_pingback_server_uri($url, $deprecated = '') {
- if ( !empty($deprecated) )
- _deprecated_argument(__FUNCTION__, 'deprecated', '0.0');
</del><ins>+function discover_pingback_server_uri( $url, $deprecated = '' ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx">
</span><span class="cx"> $pingback_str_dquote = 'rel="pingback"';
</span><span class="cx"> $pingback_str_squote = 'rel=\'pingback\'';
</span></span></pre></div>
<a id="trunkwpincludescronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cron.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cron.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/cron.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> // Backward compatibility
</span><span class="cx"> // Previously this function took the arguments as discrete vars rather than an array like the rest of the API
</span><span class="cx"> if ( !is_array($args) ) {
</span><del>- _deprecated_argument(__FUNCTION__, 'args', '3.0.0', __('This argument has changed to an array so as to match with the behaviour of all the other cron functions.') );
</del><ins>+ _deprecated_argument( __FUNCTION__, '3.0.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
</ins><span class="cx"> $args = array_slice( func_get_args(), 1 );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/formatting.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -866,6 +866,9 @@
</span><span class="cx"> * @return string Converted string.
</span><span class="cx"> */
</span><span class="cx"> function convert_chars($content, $deprecated = '') {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> // Translation of invalid Unicode references range to valid range
</span><span class="cx"> $wp_htmltranswinuni = array(
</span><span class="cx"> '&#128;' => '&#8364;', // the Euro sign
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/functions.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -570,6 +570,9 @@
</span><span class="cx"> * @return null returns when finished.
</span><span class="cx"> */
</span><span class="cx"> function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.3' );
+
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> wp_protect_special_option( $name );
</span><span class="lines">@@ -1203,6 +1206,9 @@
</span><span class="cx"> * @return bool|string False on failure and string of headers if HEAD request.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_http( $url, $file_path = false, $deprecated = false ) {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> @set_time_limit( 60 );
</span><span class="cx">
</span><span class="cx"> $options = array();
</span><span class="lines">@@ -1245,6 +1251,9 @@
</span><span class="cx"> * @return bool|string False on failure, headers on success.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_http_headers( $url, $deprecated = false ) {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> $response = wp_remote_head( $url );
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><span class="lines">@@ -2187,6 +2196,9 @@
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> if ( empty( $name ) )
</span><span class="cx"> return array( 'error' => __( 'Empty filename' ) );
</span><span class="cx">
</span><span class="lines">@@ -3039,7 +3051,7 @@
</span><span class="cx"> * For example:
</span><span class="cx"> * <code>
</span><span class="cx"> * if ( !empty($deprecated) )
</span><del>- * _deprecated_argument( __FUNCTION__, 'deprecated', '0.0' );
</del><ins>+ * _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx"> * </code>
</span><span class="cx"> *
</span><span class="cx"> * There is a hook deprecated_argument_run that will be called that can be used
</span><span class="lines">@@ -3053,24 +3065,23 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><del>- * @uses do_action() Calls 'deprecated_argument_run' and passes the function and argument names and what to use instead.
</del><ins>+ * @uses do_action() Calls 'deprecated_argument_run' and passes the function name and what to use instead.
</ins><span class="cx"> * @uses apply_filters() Calls 'deprecated_argument_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
</span><span class="cx"> *
</span><span class="cx"> * @param string $function The function that was called
</span><del>- * @param string $argument The name of the deprecated argument that was used
- * @param string $version The version of WordPress that deprecated the function
</del><ins>+ * @param string $version The version of WordPress that deprecated the argument used
</ins><span class="cx"> * @param string $message Optional. A message regarding the change.
</span><span class="cx"> */
</span><del>-function _deprecated_argument($function, $argument, $version, $message = null) {
</del><ins>+function _deprecated_argument($function, $version, $message = null) {
</ins><span class="cx">
</span><del>- do_action('deprecated_argument_run', $function, $argument, $message);
</del><ins>+ do_action('deprecated_argument_run', $function, $message);
</ins><span class="cx">
</span><span class="cx"> // Allow plugin to filter the output error trigger
</span><span class="cx"> if( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
</span><span class="cx"> if( !is_null($message) )
</span><del>- trigger_error( sprintf( __('The %1$s argument of %2$s is <strong>deprecated</strong> since version %3$s! %4$s'), $function, $argument, $version, $message ) );
</del><ins>+ trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
</ins><span class="cx"> else
</span><del>- trigger_error( sprintf( __('The %1$s argument of %2$s is <strong>deprecated</strong> since version %3$s with no alternative available.'), $function, $argument, $version ) );
</del><ins>+ trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/kses.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -1197,6 +1197,9 @@
</span><span class="cx"> add_action('set_current_user', 'kses_init');
</span><span class="cx">
</span><span class="cx"> function safecss_filter_attr( $css, $deprecated = '' ) {
</span><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> $css = wp_kses_no_null($css);
</span><span class="cx"> $css = str_replace(array("\n","\r","\t"), '', $css);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/link-template.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -168,7 +168,10 @@
</span><span class="cx"> * @param mixed $deprecated Not used.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function post_permalink($post_id = 0, $deprecated = '') {
</del><ins>+function post_permalink( $post_id = 0, $deprecated = '' ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> return get_permalink($post_id);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/post-template.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -246,9 +246,9 @@
</span><span class="cx"> * @param mixed $deprecated Not used.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function get_the_excerpt($deprecated = '') {
</del><ins>+function get_the_excerpt( $deprecated = '' ) {
</ins><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument(__FUNCTION__, 'deprecated', '2.3');
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.3' );
</ins><span class="cx">
</span><span class="cx"> global $post;
</span><span class="cx"> $output = $post->post_excerpt;
</span><span class="lines">@@ -901,7 +901,10 @@
</span><span class="cx"> * @param bool $deprecated Deprecated. Not used.
</span><span class="cx"> * @param bool $permalink Optional, default is false. Whether to include permalink.
</span><span class="cx"> */
</span><del>-function the_attachment_link($id = 0, $fullsize = false, $deprecated = false, $permalink = false) {
</del><ins>+function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
+
</ins><span class="cx"> if ( $fullsize )
</span><span class="cx"> echo wp_get_attachment_link($id, 'full', $permalink);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/post.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -3538,9 +3538,11 @@
</span><span class="cx"> * @param int $deprecated Not Used. Can be set to null.
</span><span class="cx"> * @param object $post Object type containing the post information
</span><span class="cx"> */
</span><del>-function _future_post_hook($deprecated = '', $post) {
</del><ins>+function _future_post_hook( $deprecated = '', $post ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx"> wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
</span><del>- wp_schedule_single_event(strtotime($post->post_date_gmt. ' GMT'), 'publish_future_post', array($post->ID));
</del><ins>+ wp_schedule_single_event( strtotime( $post->post_date_gmt. ' GMT' ), 'publish_future_post', array( $post->ID ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (12583 => 12584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2009-12-30 10:15:10 UTC (rev 12583)
+++ trunk/wp-includes/widgets.php 2009-12-30 16:23:39 UTC (rev 12584)
</span><span class="lines">@@ -985,7 +985,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_get_sidebars_widgets($deprecated = true) {
</span><span class="cx"> if ( $deprecated !== true )
</span><del>- _deprecated_argument(__FUNCTION__, 'deprecated', '0.0');
</del><ins>+ _deprecated_argument( __FUNCTION__, '0.0' );
</ins><span class="cx">
</span><span class="cx"> global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>