<!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>[13093] trunk/wp-includes: Move deprecated functions to deprecated.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13093">13093</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-13 06:39:51 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move deprecated functions to deprecated.php. Deprecate get_the_attachment_link() for wp_get_attachment_link(), get_attachment_icon_src() for wp_get_attachment_image_src(),
get_attachment_icon() and get_attachment_innerHTML() for wp_get_attachment_image(), get_link() for get_bookmark(). Add missing deprecated version numbers. Add inline documentation to pluggable functions that are deprecated. See <a href="http://trac.wordpress.org/ticket/11388">#11388</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesbookmarkphp">trunk/wp-includes/bookmark.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/bookmark.php (13092 => 13093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/bookmark.php 2010-02-13 06:20:45 UTC (rev 13092)
+++ trunk/wp-includes/bookmark.php 2010-02-13 06:39:51 UTC (rev 13093)
</span><span class="lines">@@ -80,21 +80,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve bookmark data based on ID.
- *
- * @since 2.0.0
- * @deprecated Use get_bookmark()
- * @see get_bookmark()
- *
- * @param int $bookmark_id ID of link
- * @param string $output Either OBJECT, ARRAY_N, or ARRAY_A
- * @return object|array
- */
-function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
- return get_bookmark($bookmark_id, $output, $filter);
-}
-
-/**
</del><span class="cx"> * Retrieves the list of bookmarks
</span><span class="cx"> *
</span><span class="cx"> * Attempts to retrieve from the cache first based on MD5 hash of arguments. If
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (13092 => 13093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-02-13 06:20:45 UTC (rev 13092)
+++ trunk/wp-includes/deprecated.php 2010-02-13 06:39:51 UTC (rev 13093)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> function start_wp() {
</span><span class="cx"> global $wp_query, $post;
</span><span class="cx">
</span><del>- _deprecated_function( __FUNCTION__, '1.5', __('new WordPress Loop') );
</del><ins>+ _deprecated_function( __FUNCTION__, '1.5', __('new WordPress Loop') );
</ins><span class="cx">
</span><span class="cx"> // Since the old style loop is being used, advance the query iterator here.
</span><span class="cx"> $wp_query->next_post();
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> $post = get_post($post_id);
</span><span class="cx"> $post_author_data = get_userdata($post->post_author);
</span><span class="cx">
</span><del>- if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
</del><ins>+ if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
</ins><span class="cx"> || ($author_data->user_level > $post_author_data->user_level)
</span><span class="cx"> || ($author_data->user_level >= 10) ) {
</span><span class="cx"> return true;
</span><span class="lines">@@ -487,6 +487,7 @@
</span><span class="cx"> * Gets the links associated with the named category.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.1
</span><ins>+ * @deprecated 2.1
</ins><span class="cx"> * @deprecated Use wp_list_bookmarks()
</span><span class="cx"> * @see wp_list_bookmarks()
</span><span class="cx"> *
</span><span class="lines">@@ -661,13 +662,14 @@
</span><span class="cx"> * Gets the auto_toggle setting.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><ins>+ * @deprecated 2.1
</ins><span class="cx"> * @deprecated No alternative function available
</span><span class="cx"> *
</span><span class="cx"> * @param int $id The category to get. If no category supplied uses 0
</span><span class="cx"> * @return int Only returns 0.
</span><span class="cx"> */
</span><span class="cx"> function get_autotoggle($id = 0) {
</span><del>- _deprecated_function( __FUNCTION__, '2.1' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.1' );
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -741,6 +743,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @since 0.71
</span><ins>+ * @deprecated 2.1
</ins><span class="cx"> * @deprecated Use wp_dropdown_categories()
</span><span class="cx"> * @see wp_dropdown_categories()
</span><span class="cx"> *
</span><span class="lines">@@ -931,13 +934,14 @@
</span><span class="cx"> * Print the permalink to the RSS feed.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><ins>+ * @deprecated 2.3
</ins><span class="cx"> * @deprecated Use the_permalink_rss()
</span><span class="cx"> * @see the_permalink_rss()
</span><span class="cx"> *
</span><span class="cx"> * @param string $file
</span><span class="cx"> */
</span><span class="cx"> function permalink_single_rss($deprecated = '') {
</span><del>- _deprecated_function(__FUNCTION__, '0.0', 'the_permalink_rss()');
</del><ins>+ _deprecated_function( __FUNCTION__, '0.0', 'the_permalink_rss()' );
</ins><span class="cx"> the_permalink_rss();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -946,14 +950,15 @@
</span><span class="cx"> *
</span><span class="cx"> * @see get_links() for argument information that can be used in $args
</span><span class="cx"> * @since 1.0.1
</span><del>- * @deprecated Use get_bookmarks()
- * @see get_bookmarks()
</del><ins>+ * @deprecated 2.1
+ * @deprecated Use wp_list_bookmarks()
+ * @see wp_list_bookmarks()
</ins><span class="cx"> *
</span><span class="cx"> * @param string $args a query string
</span><span class="cx"> * @return null|string
</span><span class="cx"> */
</span><span class="cx"> function wp_get_links($args = '') {
</span><del>- _deprecated_function(__FUNCTION__, '0.0', 'wp_list_bookmarks()');
</del><ins>+ _deprecated_function( __FUNCTION__, '0.0', 'wp_list_bookmarks()' );
</ins><span class="cx">
</span><span class="cx"> if ( strpos( $args, '=' ) === false ) {
</span><span class="cx"> $cat_id = $args;
</span><span class="lines">@@ -985,6 +990,7 @@
</span><span class="cx"> * Gets the links associated with category by id.
</span><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><ins>+ * @deprecated 2.1
</ins><span class="cx"> * @deprecated Use get_bookmarks()
</span><span class="cx"> * @see get_bookmarks()
</span><span class="cx"> *
</span><span class="lines">@@ -1150,7 +1156,7 @@
</span><span class="cx"> * @param bool $count the number of links in the db
</span><span class="cx"> */
</span><span class="cx"> function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
</span><del>- _deprecated_function( __FUNCTION__, '2.1' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.1' );
</ins><span class="cx">
</span><span class="cx"> if ( $count )
</span><span class="cx"> $counts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->links");
</span><span class="lines">@@ -1306,7 +1312,7 @@
</span><span class="cx"> * @deprecated 2.5
</span><span class="cx"> */
</span><span class="cx"> function gzip_compression() {
</span><del>- _deprecated_function( __FUNCTION__, '2.5', '' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.5' );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1393,7 +1399,7 @@
</span><span class="cx"> * @return string The author's description.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_description() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'description\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'description\')' );
</ins><span class="cx"> return get_the_author_meta('description');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1406,7 +1412,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_description() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'description\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'description\')' );
</ins><span class="cx"> the_author_meta('description');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1421,7 +1427,7 @@
</span><span class="cx"> * @return string The author's login name (username).
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_login() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'login\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'login\')' );
</ins><span class="cx"> return get_the_author_meta('login');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1434,7 +1440,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_login() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'login\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'login\')' );
</ins><span class="cx"> the_author_meta('login');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1449,7 +1455,7 @@
</span><span class="cx"> * @return string The author's first name.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_firstname() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')' );
</ins><span class="cx"> return get_the_author_meta('first_name');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1462,7 +1468,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_firstname() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'first_name\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'first_name\')' );
</ins><span class="cx"> the_author_meta('first_name');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1477,7 +1483,7 @@
</span><span class="cx"> * @return string The author's last name.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_lastname() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')' );
</ins><span class="cx"> return get_the_author_meta('last_name');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1490,7 +1496,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_lastname() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'last_name\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'last_name\')' );
</ins><span class="cx"> the_author_meta('last_name');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1505,7 +1511,7 @@
</span><span class="cx"> * @return string The author's nickname.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_nickname() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')' );
</ins><span class="cx"> return get_the_author_meta('nickname');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1518,7 +1524,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_nickname() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'nickname\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'nickname\')' );
</ins><span class="cx"> the_author_meta('nickname');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1533,7 +1539,7 @@
</span><span class="cx"> * @return string The author's username.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_email() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'email\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'email\')' );
</ins><span class="cx"> return get_the_author_meta('email');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1546,7 +1552,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_email() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'email\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'email\')' );
</ins><span class="cx"> the_author_meta('email');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1561,7 +1567,7 @@
</span><span class="cx"> * @return string The author's ICQ number.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_icq() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')' );
</ins><span class="cx"> return get_the_author_meta('icq');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1574,7 +1580,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_icq() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'icq\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'icq\')' );
</ins><span class="cx"> the_author_meta('icq');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1589,7 +1595,7 @@
</span><span class="cx"> * @return string The author's Yahoo! IM name.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_yim() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')' );
</ins><span class="cx"> return get_the_author_meta('yim');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1602,7 +1608,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_yim() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'yim\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'yim\')' );
</ins><span class="cx"> the_author_meta('yim');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1617,7 +1623,7 @@
</span><span class="cx"> * @return string The author's MSN address.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_msn() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')' );
</ins><span class="cx"> return get_the_author_meta('msn');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1630,7 +1636,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_msn() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'msn\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'msn\')' );
</ins><span class="cx"> the_author_meta('msn');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1645,7 +1651,7 @@
</span><span class="cx"> * @return string The author's AIM address.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_aim() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')' );
</ins><span class="cx"> return get_the_author_meta('aim');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1658,7 +1664,7 @@
</span><span class="cx"> * @deprecated Use the_author_meta('aim')
</span><span class="cx"> */
</span><span class="cx"> function the_author_aim() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'aim\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'aim\')' );
</ins><span class="cx"> the_author_meta('aim');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1674,7 +1680,7 @@
</span><span class="cx"> * @return string The author's display name.
</span><span class="cx"> */
</span><span class="cx"> function get_author_name( $auth_id = false ) {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')' );
</ins><span class="cx"> return get_the_author_meta('display_name', $auth_id);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1689,7 +1695,7 @@
</span><span class="cx"> * @return string The URL to the author's page.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_url() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'url\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'url\')' );
</ins><span class="cx"> return get_the_author_meta('url');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1702,7 +1708,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_url() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'url\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'url\')' );
</ins><span class="cx"> the_author_meta('url');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1717,7 +1723,7 @@
</span><span class="cx"> * @return int The author's ID.
</span><span class="cx"> */
</span><span class="cx"> function get_the_author_ID() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
</ins><span class="cx"> return get_the_author_meta('ID');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1730,7 +1736,7 @@
</span><span class="cx"> * @see the_author_meta()
</span><span class="cx"> */
</span><span class="cx"> function the_author_ID() {
</span><del>- _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'ID\')' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'ID\')' );
</ins><span class="cx"> the_author_meta('ID');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1769,7 +1775,7 @@
</span><span class="cx"> * @param int $encode_html Optional. How to encode the content.
</span><span class="cx"> */
</span><span class="cx"> function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
</span><del>- _deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
</ins><span class="cx"> $content = get_the_content($more_link_text, $stripteaser, $more_file);
</span><span class="cx"> $content = apply_filters('the_content_rss', $content);
</span><span class="cx"> if ( $cut && !$encode_html )
</span><span class="lines">@@ -1815,7 +1821,7 @@
</span><span class="cx"> * @return string HTML stripped out of content with links at the bottom.
</span><span class="cx"> */
</span><span class="cx"> function make_url_footnote( $content ) {
</span><del>- _deprecated_function( __FUNCTION__, '2.9', '' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.9', '' );
</ins><span class="cx"> preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
</span><span class="cx"> $links_summary = "\n";
</span><span class="cx"> for ( $i=0; $i<count($matches[0]); $i++ ) {
</span><span class="lines">@@ -1855,7 +1861,7 @@
</span><span class="cx"> * @return string Translated context string without pipe
</span><span class="cx"> */
</span><span class="cx"> function _c( $text, $domain = 'default' ) {
</span><del>- _deprecated_function(__FUNCTION__, '2.9', '_x' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.9', '_x()' );
</ins><span class="cx"> return translate_with_context( $text, $domain );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1872,7 +1878,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function _nc( $single, $plural, $number, $domain = 'default' ) {
</span><del>- _deprecated_function(__FUNCTION__, '2.9', '_nx' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.9', '_nx()' );
</ins><span class="cx"> return before_last_bar( _n( $single, $plural, $number, $domain ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1890,4 +1896,182 @@
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'wp_load_alloptions()' );
</span><span class="cx"> return wp_load_alloptions();
</span><span class="cx"> }
</span><ins>+
+/**
+ * Retrieve HTML content of attachment image with link.
+ *
+ * @since 2.0.0
+ * @deprecated 2.5.0
+ * @deprecated Use wp_get_attachment_link()
+ * @see wp_get_attachment_link()
+ *
+ * @param int $id Optional. Post ID.
+ * @param bool $fullsize Optional, default is false. Whether to use full size image.
+ * @param array $max_dims Optional. Max image dimensions.
+ * @param bool $permalink Optional, default is false. Whether to include permalink to image.
+ * @return string
+ */
+function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
+ _deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_link()' );
+ $id = (int) $id;
+ $_post = & get_post($id);
+
+ if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
+ return __('Missing Attachment');
+
+ if ( $permalink )
+ $url = get_attachment_link($_post->ID);
+
+ $post_title = esc_attr($_post->post_title);
+
+ $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims);
+ return "<a href='$url' title='$post_title'>$innerHTML</a>";
+}
+
+/**
+ * Retrieve icon URL and Path.
+ *
+ * @since 2.1.0
+ * @deprecated 2.5.0
+ * @deprecated Use wp_get_attachment_image_src()
+ * @see wp_get_attachment_image_src()
+ *
+ * @param int $id Optional. Post ID.
+ * @param bool $fullsize Optional, default to false. Whether to have full image.
+ * @return array Icon URL and full path to file, respectively.
+ */
+function get_attachment_icon_src( $id = 0, $fullsize = false ) {
+ _deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image_src()' );
+ $id = (int) $id;
+ if ( !$post = & get_post($id) )
+ return false;
+
+ $file = get_attached_file( $post->ID );
+
+ if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
+ // We have a thumbnail desired, specified and existing
+
+ $src_file = basename($src);
+ $class = 'attachmentthumb';
+ } elseif ( wp_attachment_is_image( $post->ID ) ) {
+ // We have an image without a thumbnail
+
+ $src = wp_get_attachment_url( $post->ID );
+ $src_file = & $file;
+ $class = 'attachmentimage';
+ } elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
+ // No thumb, no image. We'll look for a mime-related icon instead.
+
+ $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
+ $src_file = $icon_dir . '/' . basename($src);
+ }
+
+ if ( !isset($src) || !$src )
+ return false;
+
+ return array($src, $src_file);
+}
+
+/**
+ * Retrieve HTML content of icon attachment image element.
+ *
+ * @since 2.0.0
+ * @deprecated 2.5.0
+ * @deprecated Use wp_get_attachment_image()
+ * @see wp_get_attachment_image()
+ *
+ * @param int $id Optional. Post ID.
+ * @param bool $fullsize Optional, default to false. Whether to have full size image.
+ * @param array $max_dims Optional. Dimensions of image.
+ * @return string HTML content.
+ */
+function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
+ _deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
+ $id = (int) $id;
+ if ( !$post = & get_post($id) )
+ return false;
+
+ if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
+ return false;
+
+ list($src, $src_file) = $src;
+
+ // Do we need to constrain the image?
+ if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+
+ $imagesize = getimagesize($src_file);
+
+ if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+ $actual_aspect = $imagesize[0] / $imagesize[1];
+ $desired_aspect = $max_dims[0] / $max_dims[1];
+
+ if ( $actual_aspect >= $desired_aspect ) {
+ $height = $actual_aspect * $max_dims[0];
+ $constraint = "width='{$max_dims[0]}' ";
+ $post->iconsize = array($max_dims[0], $height);
+ } else {
+ $width = $max_dims[1] / $actual_aspect;
+ $constraint = "height='{$max_dims[1]}' ";
+ $post->iconsize = array($width, $max_dims[1]);
+ }
+ } else {
+ $post->iconsize = array($imagesize[0], $imagesize[1]);
+ $constraint = '';
+ }
+ } else {
+ $constraint = '';
+ }
+
+ $post_title = esc_attr($post->post_title);
+
+ $icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
+
+ return apply_filters( 'attachment_icon', $icon, $post->ID );
+}
+
+/**
+ * Retrieve HTML content of image element.
+ *
+ * @since 2.0.0
+ * @deprecated 2.5.0
+ * @deprecated Use wp_get_attachment_image()
+ * @see wp_get_attachment_image()
+ *
+ * @param int $id Optional. Post ID.
+ * @param bool $fullsize Optional, default to false. Whether to have full size image.
+ * @param array $max_dims Optional. Dimensions of image.
+ * @return string
+ */
+function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
+ _deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
+ $id = (int) $id;
+ if ( !$post = & get_post($id) )
+ return false;
+
+ if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
+ return $innerHTML;
+
+
+ $innerHTML = esc_attr($post->post_title);
+
+ return apply_filters('attachment_innerHTML', $innerHTML, $post->ID);
+}
+
+/*
+ * Retrieve bookmark data based on ID.
+ *
+ * @since 2.0.0
+ * @deprecated 2.1.0
+ * @deprecated Use get_bookmark()
+ * @see get_bookmark()
+ *
+ * @param int $bookmark_id ID of link
+ * @param string $output OBJECT, ARRAY_N, or ARRAY_A
+ * @return object|array
+ */
+function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+ _deprecated_function( __FUNCTION__, '2.1', 'get_bookmark()' );
+ return get_bookmark($bookmark_id, $output, $filter);
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (13092 => 13093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-02-13 06:20:45 UTC (rev 13092)
+++ trunk/wp-includes/pluggable.php 2010-02-13 06:39:51 UTC (rev 13093)
</span><span class="lines">@@ -1636,9 +1636,10 @@
</span><span class="cx">
</span><span class="cx"> if ( !function_exists('wp_setcookie') ) :
</span><span class="cx"> /**
</span><del>- * Sets a cookie for a user who just logged in.
</del><ins>+ * Sets a cookie for a user who just logged in. This function is deprecated.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5
</span><ins>+ * @deprecated 2.5
</ins><span class="cx"> * @deprecated Use wp_set_auth_cookie()
</span><span class="cx"> * @see wp_set_auth_cookie()
</span><span class="cx"> *
</span><span class="lines">@@ -1658,9 +1659,10 @@
</span><span class="cx">
</span><span class="cx"> if ( !function_exists('wp_clearcookie') ) :
</span><span class="cx"> /**
</span><del>- * Clears the authentication cookie, logging the user out.
</del><ins>+ * Clears the authentication cookie, logging the user out. This function is deprecated.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5
</span><ins>+ * @deprecated 2.5
</ins><span class="cx"> * @deprecated Use wp_clear_auth_cookie()
</span><span class="cx"> * @see wp_clear_auth_cookie()
</span><span class="cx"> */
</span><span class="lines">@@ -1672,25 +1674,26 @@
</span><span class="cx">
</span><span class="cx"> if ( !function_exists('wp_get_cookie_login') ):
</span><span class="cx"> /**
</span><del>- * Gets the user cookie login.
</del><ins>+ * Gets the user cookie login. This function is deprecated.
</ins><span class="cx"> *
</span><span class="cx"> * This function is deprecated and should no longer be extended as it won't be
</span><span class="cx"> * used anywhere in WordPress. Also, plugins shouldn't use it either.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.3
</span><ins>+ * @deprecated 2.5
</ins><span class="cx"> * @deprecated No alternative
</span><span class="cx"> *
</span><span class="cx"> * @return bool Always returns false
</span><span class="cx"> */
</span><span class="cx"> function wp_get_cookie_login() {
</span><del>- _deprecated_function( __FUNCTION__, '2.5', '' );
</del><ins>+ _deprecated_function( __FUNCTION__, '2.5' );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> if ( !function_exists('wp_login') ) :
</span><span class="cx"> /**
</span><del>- * Checks a users login information and logs them in if it checks out.
</del><ins>+ * Checks a users login information and logs them in if it checks out. This function is deprecated.
</ins><span class="cx"> *
</span><span class="cx"> * Use the global $error to get the reason why the login failed. If the username
</span><span class="cx"> * is blank, no error will be set, so assume blank username on that case.
</span><span class="lines">@@ -1709,6 +1712,7 @@
</span><span class="cx"> * @return bool False on login failure, true on successful check
</span><span class="cx"> */
</span><span class="cx"> function wp_login($username, $password, $deprecated = '') {
</span><ins>+ _deprecated_function( __FUNCTION__, '2.5', 'wp_signon()' );
</ins><span class="cx"> global $error;
</span><span class="cx">
</span><span class="cx"> $user = wp_authenticate($username, $password);
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (13092 => 13093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-02-13 06:20:45 UTC (rev 13092)
+++ trunk/wp-includes/post-template.php 2010-02-13 06:39:51 UTC (rev 13093)
</span><span class="lines">@@ -953,158 +953,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve HTML content of attachment image with link.
- *
- * @since 2.0.0
- * @deprecated Use {@link wp_get_attachment_link()}
- * @see wp_get_attachment_link() Use instead.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default is false. Whether to use full size image.
- * @param array $max_dims Optional. Max image dimensions.
- * @param bool $permalink Optional, default is false. Whether to include permalink to image.
- * @return string
- */
-function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
- $id = (int) $id;
- $_post = & get_post($id);
-
- if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
- return __('Missing Attachment');
-
- if ( $permalink )
- $url = get_attachment_link($_post->ID);
-
- $post_title = esc_attr($_post->post_title);
-
- $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims);
- return "<a href='$url' title='$post_title'>$innerHTML</a>";
-}
-
-/**
- * Retrieve icon URL and Path.
- *
- * @since 2.1.0
- * @deprecated Use {@link wp_get_attachment_image_src()}
- * @see wp_get_attachment_image_src() Use instead.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default to false. Whether to have full image.
- * @return array Icon URL and full path to file, respectively.
- */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
- $id = (int) $id;
- if ( !$post = & get_post($id) )
- return false;
-
- $file = get_attached_file( $post->ID );
-
- if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
- // We have a thumbnail desired, specified and existing
-
- $src_file = basename($src);
- $class = 'attachmentthumb';
- } elseif ( wp_attachment_is_image( $post->ID ) ) {
- // We have an image without a thumbnail
-
- $src = wp_get_attachment_url( $post->ID );
- $src_file = & $file;
- $class = 'attachmentimage';
- } elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
- // No thumb, no image. We'll look for a mime-related icon instead.
-
- $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
- $src_file = $icon_dir . '/' . basename($src);
- }
-
- if ( !isset($src) || !$src )
- return false;
-
- return array($src, $src_file);
-}
-
-/**
- * Retrieve HTML content of icon attachment image element.
- *
- * @since 2.0.0
- * @deprecated Use {@link wp_get_attachment_image()}
- * @see wp_get_attachment_image() Use instead of.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default to false. Whether to have full size image.
- * @param array $max_dims Optional. Dimensions of image.
- * @return string HTML content.
- */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
- $id = (int) $id;
- if ( !$post = & get_post($id) )
- return false;
-
- if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
- return false;
-
- list($src, $src_file) = $src;
-
- // Do we need to constrain the image?
- if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
-
- $imagesize = getimagesize($src_file);
-
- if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
- $actual_aspect = $imagesize[0] / $imagesize[1];
- $desired_aspect = $max_dims[0] / $max_dims[1];
-
- if ( $actual_aspect >= $desired_aspect ) {
- $height = $actual_aspect * $max_dims[0];
- $constraint = "width='{$max_dims[0]}' ";
- $post->iconsize = array($max_dims[0], $height);
- } else {
- $width = $max_dims[1] / $actual_aspect;
- $constraint = "height='{$max_dims[1]}' ";
- $post->iconsize = array($width, $max_dims[1]);
- }
- } else {
- $post->iconsize = array($imagesize[0], $imagesize[1]);
- $constraint = '';
- }
- } else {
- $constraint = '';
- }
-
- $post_title = esc_attr($post->post_title);
-
- $icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
-
- return apply_filters( 'attachment_icon', $icon, $post->ID );
-}
-
-/**
- * Retrieve HTML content of image element.
- *
- * @since 2.0.0
- * @deprecated Use {@link wp_get_attachment_image()}
- * @see wp_get_attachment_image() Use instead.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default to false. Whether to have full size image.
- * @param array $max_dims Optional. Dimensions of image.
- * @return string
- */
-function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
- $id = (int) $id;
- if ( !$post = & get_post($id) )
- return false;
-
- if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
- return $innerHTML;
-
-
- $innerHTML = esc_attr($post->post_title);
-
- return apply_filters('attachment_innerHTML', $innerHTML, $post->ID);
-}
-
-/**
</del><span class="cx"> * Wrap attachment in <<p>> element before content.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span></span></pre>
</div>
</div>
</body>
</html>