Changeset 12587 for trunk/wp-includes/general-template.php

Timestamp:

12/30/2009 05:05:02 PM (16 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.

File:

• trunk/wp-includes/general-template.php (modified) (3 diffs)

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;