Ticket #11652: 11652.diff

Index: wp-app.php
===================================================================
--- wp-app.php  (revision 12551)
+++ wp-app.php  (working copy)
@@ -371,7 +371,7 @@
                if( !current_user_can( 'edit_posts' ) )
                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
 
-               $home = esc_attr(get_bloginfo_rss('home'));
+               $home = esc_attr(get_bloginfo_rss('url'));
 
                $categories = "";
                $cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0));
Index: wp-content/themes/classic/sidebar.php
===================================================================
--- wp-content/themes/classic/sidebar.php       (revision 12551)
+++ wp-content/themes/classic/sidebar.php       (working copy)
@@ -15,7 +15,7 @@
        <?php wp_list_categories('title_li=' . __('Categories:')); ?>
  <li id="search">
    <label for="s"><?php _e('Search:'); ?></label>
-   <form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
+   <form id="searchform" method="get" action="<?php bloginfo('url'); ?>">
        <div>
                <input type="text" name="s" id="s" size="15" /><br />
                <input type="submit" value="<?php esc_attr_e('Search'); ?>" />
Index: wp-includes/feed-atom-comments.php
===================================================================
--- wp-includes/feed-atom-comments.php  (revision 12551)
+++ wp-includes/feed-atom-comments.php  (working copy)
@@ -36,7 +36,7 @@
        <link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" />
        <id><?php echo get_search_comments_feed_link('', 'atom'); ?></id>
 <?php } else { ?>
-       <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('home'); ?>" />
+       <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url'); ?>" />
        <link rel="self" type="application/atom+xml" href="<?php bloginfo_rss('comments_atom_url'); ?>" />
        <id><?php bloginfo_rss('comments_atom_url'); ?></id>
 <?php } ?>
Index: wp-includes/feed-atom.php
===================================================================
--- wp-includes/feed-atom.php   (revision 12551)
+++ wp-includes/feed-atom.php   (working copy)
@@ -13,7 +13,7 @@
   xmlns="http://www.w3.org/2005/Atom"
   xmlns:thr="http://purl.org/syndication/thread/1.0"
   xml:lang="<?php echo get_option('rss_language'); ?>"
-  xml:base="<?php bloginfo_rss('home') ?>/wp-atom.php"
+  xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
   <?php do_action('atom_ns'); ?>
  >
        <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
@@ -22,7 +22,7 @@
        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
        <?php the_generator( 'atom' ); ?>
 
-       <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
+       <link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
        <id><?php bloginfo('atom_url'); ?></id>
        <link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php    (revision 12551)
+++ wp-includes/general-template.php    (working copy)
@@ -273,9 +273,8 @@
  * Retrieve information about the blog.
  *
  * Some show parameter values are deprecated and will be removed in future
- * versions. Care should be taken to check the function contents and know what
- * the deprecated blog info options are. Options without "// DEPRECATED" are
- * the preferred and recommended ways to get the information.
+ * versions. These options will trigger the _deprecated_argument() function.
+ * The deprecated blog info options are listed in the function contents.
  *
  * The possible values for the 'show' parameter are listed below.
  * <ol>
@@ -289,21 +288,26 @@
  * comment feeds can be retrieved from the 'comments_atom_url' (Atom comment
  * feed) or 'comments_rss2_url' (RSS 2.0 comment feed).
  *
- * There are many other options and you should check the function contents:
- * {@source 32 37}
- *
  * @since 0.71
  *
  * @param string $show Blog info to retrieve.
  * @param string $filter How to filter what is retrieved.
  * @return string Mostly string values, might be empty.
  */
-function get_bloginfo($show = '', $filter = 'raw') {
+function get_bloginfo( $show = '', $filter = 'raw' ) {
+       // 'deprecated option' => array( 'version deprecated', 'option to use instead' )
+       $deprecated = array(
+               'home' => array( '2.2', 'url' ),
+               'siteurl' => array( '2.2', 'url' ),
+       );
 
-       switch($show) {
+       if ( isset( $deprecated[$show] ) ) {
+               _deprecated_argument( __FUNCTION__, $deprecated[$show][0], sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use the \'%2$s\' option instead.'), $show, $deprecated[$show][1] ) );
+               $show = $deprecated[$show][1];
+       }
+
+       switch( $show ) {
                case 'url' :
-               case 'home' : // DEPRECATED
-               case 'siteurl' : // DEPRECATED
                        $output = get_option('home');
                        break;
                case 'wpurl' :
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php       (revision 12551)
+++ wp-includes/link-template.php       (working copy)
@@ -1301,7 +1301,7 @@
        $request = preg_replace('|^/+|', '', $request);
 
        if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-               $base = trailingslashit( get_bloginfo( 'home' ) );
+               $base = trailingslashit( get_bloginfo( 'url' ) );
 
                if ( $pagenum > 1 ) {
                        $result = add_query_arg( 'paged', $pagenum, $base . $request );