Ticket #9008: 9008.5.diff

general-template.php

@@ -340 +340 @@
  * 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>
- * <li><strong>url<strong> - Blog URI to homepage.</li>
- * <li><strong>wpurl</strong> - Blog URI path to WordPress.</li>
- * <li><strong>description</strong> - Secondary title</li>
- * </ol>
+ * The possible values for the 'show' parameter are listed in the function contents.
+ * For the blog URI to the homepage, use home_url().
  *
  * The feed URL options can be retrieved from 'rdf_url' (RSS 0.91),
  * 'rss_url' (RSS 1.0), 'rss2_url' (RSS 2.0), or 'atom_url' (Atom feed). The
@@ -361 +357 @@
 function get_bloginfo( $show = '', $filter = 'raw' ) {
 
         switch( $show ) {
-                case 'home' : // DEPRECATED
-                case 'siteurl' : // DEPRECATED
-                        _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use the \'%2$s\' option instead.'), $show, 'url' ) );
-                case 'url' :
-                        $output = home_url();
+                case 'home'    : // DEPRECATED in 2.2
+                case 'siteurl' : // DEPRECATED in 2.2
+                case 'url'     : // DEPRECATED in 3.0
+                        _deprecated_argument( __FUNCTION__, '3.0', sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use home_url() instead.'), $show ) );
+                        return home_url();
                         break;
                 case 'wpurl' :
                         $output = get_option('siteurl');