<!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>[12680] trunk: Add missing version numbers to _deprecated_argument() calls.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12680">12680</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-01-09 10:03:55 +0000 (Sat, 09 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing version numbers to _deprecated_argument() calls.
Remove deprecated argument from xfn_check() calls.
Pass version number to deprecated_file_included, deprecated_function_run and deprecated_argument_run actions.
Fixes <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="#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="#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="#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 (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-admin/includes/image.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -17,12 +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><del>- * @param mixed $deprecated Not used.
</del><ins>+ * @param mixed $deprecated Never 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><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '1.2' );
</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 (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -636,13 +636,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $class
</span><span class="cx"> * @param string $value
</span><del>- * @param mixed $deprecated Not used.
</del><ins>+ * @param mixed $deprecated Never used.
</ins><span class="cx"> */
</span><del>-function xfn_check($class, $value = '', $deprecated = '') {
</del><ins>+function xfn_check( $class, $value = '', $deprecated = '' ) {
</ins><span class="cx"> global $link;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
</ins><span class="cx">
</span><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="lines">@@ -689,13 +689,13 @@
</span><span class="cx"> <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </span></legend>
</span><span class="cx"> <label for="contact">
</span><del>- <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
</del><ins>+ <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
</ins><span class="cx"> <label for="acquaintance">
</span><del>- <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
</del><ins>+ <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
</ins><span class="cx"> <label for="friend">
</span><del>- <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
</del><ins>+ <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
</ins><span class="cx"> <label for="friendship">
</span><del>- <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
</del><ins>+ <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
</ins><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -721,13 +721,13 @@
</span><span class="cx"> <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
</span><span class="cx"> <label for="co-resident">
</span><del>- <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?></label>
</span><span class="cx"> <label for="neighbor">
</span><del>- <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?></label>
</span><span class="cx"> <label for="geographical">
</span><del>- <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -735,22 +735,22 @@
</span><span class="cx"> <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
</span><span class="cx"> <label for="child">
</span><del>- <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
</span><span class="cx"> <label for="kin">
</span><del>- <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
</span><span class="cx"> <label for="parent">
</span><del>- <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?></label>
</span><span class="cx"> <label for="sibling">
</span><del>- <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?></label>
</span><span class="cx"> <label for="spouse">
</span><del>- <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?></label>
</span><span class="cx"> <label for="family">
</span><del>- <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpincludesauthortemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/author-template.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/author-template.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/author-template.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> global $authordata;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.1' );
</ins><span class="cx">
</span><span class="cx"> return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null);
</span><span class="cx"> }
</span><span class="lines">@@ -49,8 +49,10 @@
</span><span class="cx"> * @return string The author's display name, from get_the_author().
</span><span class="cx"> */
</span><span class="cx"> function the_author( $deprecated = '', $deprecated_echo = true ) {
</span><del>- 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 );
</del><ins>+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.1' );
+ if ( $deprecated_echo !== true )
+ _deprecated_argument( __FUNCTION__, '1.5', __('Use get_the_author() instead if you do not want the value echoed.') );
</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">@@ -184,7 +186,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__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.1' );
</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 (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/comment-template.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -504,11 +504,13 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="cx"> * @param string $deprecated Not Used
</span><del>- * @param bool $deprecated Not Used
</del><ins>+ * @param bool $deprecated_2 Not Used
</ins><span class="cx"> */
</span><del>-function comments_link( $deprecated = '', $deprecated = '' ) {
</del><ins>+function comments_link( $deprecated = '', $deprecated_2 = '' ) {
</ins><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '0.72' );
+ if ( !empty( $deprecated_2 ) )
+ _deprecated_argument( __FUNCTION__, '1.3' );
</ins><span class="cx"> echo get_comments_link();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -553,7 +555,7 @@
</span><span class="cx"> global $id;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '1.3' );
</ins><span class="cx">
</span><span class="cx"> $number = get_comments_number($id);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/comment.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -1513,7 +1513,7 @@
</span><span class="cx"> */
</span><span class="cx"> function discover_pingback_server_uri( $url, $deprecated = '' ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.7' );
</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="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/formatting.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -867,7 +867,7 @@
</span><span class="cx"> */
</span><span class="cx"> function convert_chars($content, $deprecated = '') {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '0.71' );
</ins><span class="cx">
</span><span class="cx"> // Translation of invalid Unicode references range to valid range
</span><span class="cx"> $wp_htmltranswinuni = array(
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/functions.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -1170,7 +1170,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_get_http( $url, $file_path = false, $deprecated = false ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.7' );
</ins><span class="cx">
</span><span class="cx"> @set_time_limit( 60 );
</span><span class="cx">
</span><span class="lines">@@ -1215,7 +1215,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_get_http_headers( $url, $deprecated = false ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.7' );
</ins><span class="cx">
</span><span class="cx"> $response = wp_remote_head( $url );
</span><span class="cx">
</span><span class="lines">@@ -2153,14 +2153,14 @@
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $name
</span><del>- * @param null $deprecated Not used. Set to null.
</del><ins>+ * @param null $deprecated Never used. Set to null.
</ins><span class="cx"> * @param mixed $bits File content
</span><span class="cx"> * @param string $time Optional. Time formatted in 'yyyy/mm'.
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.0' );
</ins><span class="cx">
</span><span class="cx"> if ( empty( $name ) )
</span><span class="cx"> return array( 'error' => __( 'Empty filename' ) );
</span><span class="lines">@@ -2961,24 +2961,26 @@
</span><span class="cx"> * This function is to be used in every function in depreceated.php
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @package Debug
</del><ins>+ * @subpackage Debug
</ins><span class="cx"> * @since 2.5.0
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><del>- * @uses do_action() Calls 'deprecated_function_run' and passes the function name and what to use instead.
- * @uses apply_filters() Calls 'deprecated_function_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
</del><ins>+ * @uses do_action() Calls 'deprecated_function_run' and passes the function name, what to use instead,
+ * and the version the function was deprecated in.
+ * @uses apply_filters() Calls 'deprecated_function_trigger_error' and expects boolean value of true to do
+ * trigger or false to not trigger error.
</ins><span class="cx"> *
</span><span class="cx"> * @param string $function The function that was called
</span><span class="cx"> * @param string $version The version of WordPress that deprecated the function
</span><span class="cx"> * @param string $replacement Optional. The function that should have been called
</span><span class="cx"> */
</span><del>-function _deprecated_function($function, $version, $replacement=null) {
</del><ins>+function _deprecated_function( $function, $version, $replacement=null ) {
</ins><span class="cx">
</span><del>- do_action('deprecated_function_run', $function, $replacement);
</del><ins>+ do_action( 'deprecated_function_run', $function, $replacement, $version );
</ins><span class="cx">
</span><span class="cx"> // Allow plugin to filter the output error trigger
</span><del>- if( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true )) {
- if( !is_null($replacement) )
</del><ins>+ if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
+ if ( ! is_null($replacement) )
</ins><span class="cx"> trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
</span><span class="cx"> else
</span><span class="cx"> trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
</span><span class="lines">@@ -2997,24 +2999,26 @@
</span><span class="cx"> * This function is to be used in every file that is depreceated
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @package Debug
</del><ins>+ * @subpackage Debug
</ins><span class="cx"> * @since 2.5.0
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><del>- * @uses do_action() Calls 'deprecated_file_included' and passes the file name and what to use instead.
- * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
</del><ins>+ * @uses do_action() Calls 'deprecated_file_included' and passes the file name, what to use instead,
+ * and the version in which the file was deprecated.
+ * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do
+ * trigger or false to not trigger error.
</ins><span class="cx"> *
</span><span class="cx"> * @param string $file The file that was included
</span><span class="cx"> * @param string $version The version of WordPress that deprecated the file
</span><span class="cx"> * @param string $replacement Optional. The file that should have been included based on ABSPATH
</span><span class="cx"> */
</span><del>-function _deprecated_file($file, $version, $replacement=null) {
</del><ins>+function _deprecated_file( $file, $version, $replacement = null ) {
</ins><span class="cx">
</span><del>- do_action('deprecated_file_included', $file, $replacement);
</del><ins>+ do_action( 'deprecated_file_included', $file, $replacement, $version );
</ins><span class="cx">
</span><span class="cx"> // Allow plugin to filter the output error trigger
</span><del>- if( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
- if( !is_null($replacement) )
</del><ins>+ if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
+ if ( ! is_null( $replacement ) )
</ins><span class="cx"> trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
</span><span class="cx"> else
</span><span class="cx"> trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) );
</span><span class="lines">@@ -3029,7 +3033,7 @@
</span><span class="cx"> * For example:
</span><span class="cx"> * <code>
</span><span class="cx"> * if ( !empty($deprecated) )
</span><del>- * _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ * _deprecated_argument( __FUNCTION__, '3.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">@@ -3039,24 +3043,26 @@
</span><span class="cx"> * The current behavior is to trigger an user error if WP_DEBUG is true.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @package Debug
</del><ins>+ * @subpackage Debug
</ins><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 name and what to use instead.
- * @uses apply_filters() Calls 'deprecated_argument_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
</del><ins>+ * @uses do_action() Calls 'deprecated_argument_run' and passes the function name, a message on the change,
+ * and the version in which the argument was deprecated.
+ * @uses apply_filters() Calls 'deprecated_argument_trigger_error' and expects boolean value of true to do
+ * trigger or false to not trigger error.
</ins><span class="cx"> *
</span><span class="cx"> * @param string $function The function that was called
</span><span class="cx"> * @param string $version The version of WordPress that deprecated the argument used
</span><span class="cx"> * @param string $message Optional. A message regarding the change.
</span><span class="cx"> */
</span><del>-function _deprecated_argument($function, $version, $message = null) {
</del><ins>+function _deprecated_argument( $function, $version, $message = null ) {
</ins><span class="cx">
</span><del>- do_action('deprecated_argument_run', $function, $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><del>- if( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
- if( !is_null($message) )
</del><ins>+ if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
+ if ( ! is_null( $message ) )
</ins><span class="cx"> trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
</span><span class="cx"> else
</span><span class="cx"> 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 ) );
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/kses.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -1196,9 +1196,14 @@
</span><span class="cx"> add_action('init', 'kses_init');
</span><span class="cx"> add_action('set_current_user', 'kses_init');
</span><span class="cx">
</span><ins>+/**
+ * Inline CSS filter
+ *
+ * @since 2.8.1
+ */
</ins><span class="cx"> function safecss_filter_attr( $css, $deprecated = '' ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
</ins><span class="cx">
</span><span class="cx"> $css = wp_kses_no_null($css);
</span><span class="cx"> $css = str_replace(array("\n","\r","\t"), '', $css);
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/link-template.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> */
</span><span class="cx"> function post_permalink( $post_id = 0, $deprecated = '' ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '1.3' );
</ins><span class="cx">
</span><span class="cx"> return get_permalink($post_id);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/post-template.php 2010-01-09 10:03:55 UTC (rev 12680)
</span><span class="lines">@@ -903,7 +903,7 @@
</span><span class="cx"> */
</span><span class="cx"> function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
</span><span class="cx"> if ( !empty( $deprecated ) )
</span><del>- _deprecated_argument( __FUNCTION__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.5' );
</ins><span class="cx">
</span><span class="cx"> if ( $fullsize )
</span><span class="cx"> echo wp_get_attachment_link($id, 'full', $permalink);
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (12679 => 12680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2010-01-09 09:55:41 UTC (rev 12679)
+++ trunk/wp-includes/widgets.php 2010-01-09 10:03:55 UTC (rev 12680)
</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__, '0.0' );
</del><ins>+ _deprecated_argument( __FUNCTION__, '2.8.1' );
</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>