Changeset 12587

Timestamp:

12/30/2009 05:05:02 PM (15 years ago)

Author:

westi

Message:

Use _deprecated_argument() in get_bloginfo() and then don't pass deprecated argument to get_bloginfo(). Fixes #11652 props nacin.

Location:

trunk

Files:

• wp-app.php (modified) (1 diff)
• wp-includes/feed-atom-comments.php (modified) (1 diff)
• wp-includes/feed-atom.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (3 diffs)
• wp-includes/link-template.php (modified) (1 diff)

trunk/wp-app.php

@@ -372 +372 @@
             $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 = "";

trunk/wp-includes/feed-atom-comments.php

@@ -37 +37 @@
     <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>

trunk/wp-includes/feed-atom.php

@@ -14 +14 @@
   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'); ?>
  >
@@ -23 +23 @@
     <?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(); ?>" />

trunk/wp-includes/general-template.php

@@ -274 +274 @@
  *
  * 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.
@@ -290 +289 @@
  * 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
  *
@@ -299 +295 @@
  * @return string Mostly string values, might be empty.
  */
-function get_bloginfo($show = '', $filter = 'raw') {
-
-    switch($show) {
-        case 'url' :
+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 = get_option('home');
             break;

trunk/wp-includes/link-template.php

@@ -1305 +1305 @@
 
     if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-        $base = trailingslashit( get_bloginfo( 'home' ) );
+        $base = trailingslashit( get_bloginfo( 'url' ) );
 
         if ( $pagenum > 1 ) {