Changeset 20231

Timestamp:

03/21/2012 03:36:17 AM (13 years ago)

Author:

nacin

Message:

Callbacks for custom headers and custom backgrounds registered through add_theme_support() are now wp-head-callback, admin-head-callback, and admin-preview-callback. see #19910.

Location:

trunk

Files:

• wp-content/themes/twentyeleven/functions.php (modified) (1 diff)
• wp-content/themes/twentyten/functions.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (7 diffs)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -119 +119 @@
         'random-default' => true,
         // Callback for styling the header.
-        'callback' => 'twentyeleven_header_style',
+        'wp-head-callback' => 'twentyeleven_header_style',
         // Callback for styling the header preview in the admin.
-        'admin-header-callback' => 'twentyeleven_admin_header_style',
+        'admin-head-callback' => 'twentyeleven_admin_header_style',
         // Callback used to display the header preview in the admin.
-        'admin-image-div-callback' => 'twentyeleven_admin_header_image',
+        'admin-preview-callback' => 'twentyeleven_admin_header_image',
     ) );
 

trunk/wp-content/themes/twentyten/functions.php

@@ -114 +114 @@
         'header-text' => false,
         // Callback for styling the header preview in the admin.
-        'admin-header-callback' => 'twentyten_admin_header_style',
+        'admin-head-callback' => 'twentyten_admin_header_style',
     ) );
 

trunk/wp-includes/deprecated.php

@@ -2991 +2991 @@
  * @see add_theme_support()
  *
- * @param callback $callback Call on 'wp_head' action.
- * @param callback $admin_header_callback Call on custom header administration screen.
- * @param callback $admin_image_div_callback Output a custom header image div on the custom header administration screen. Optional.
- */
-function add_custom_image_header( $callback, $admin_header_callback, $admin_image_div_callback = '' ) {
+ * @param callback $wp_head_callback Call on 'wp_head' action.
+ * @param callback $admin_head_callback Call on custom header administration screen.
+ * @param callback $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
+ */
+function add_custom_image_header( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
     _deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )' );
     return add_theme_support( 'custom-header', array(
-        'callback' => $callback,
-        'admin-header-callback' => $admin_header_callback,
-        'admin-image-div-callback' => $admin_image_div_callback,
+        'wp-head-callback' => $wp_head_callback,
+        'admin-head-callback' => $admin_head_callback,
+        'admin-preview-callback' => $admin_preview_callback,
     ) );
 }
@@ -3022 +3022 @@
  * Add callbacks for background image display.
  *
- * The parameter $header_callback callback will be required to display the
- * content for the 'wp_head' action. The parameter $admin_header_callback
- * callback will be added to Custom_Background class and that will be added
- * to the 'admin_menu' action.
- *
  * @since 3.0.0
- * @uses Custom_Background Sets up for $admin_header_callback for administration panel display.
- *
- * @param callback $callback Call on 'wp_head' action.
- * @param callback $admin_header_callback Call on custom background administration screen.
- * @param callback $admin_image_div_callback Output a custom background image div on the custom background administration screen. Optional.
- */
-function add_custom_background( $callback = '', $admin_header_callback = '', $admin_image_div_callback = '' ) {
+ * @deprecated 3.4.0
+ * @deprecated Use add_theme_support('custom-background, $args)
+ * @see add_theme_support()
+ *
+ * @param callback $wp_head_callback Call on 'wp_head' action.
+ * @param callback $admin_head_callback Call on custom background administration screen.
+ * @param callback $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
+ */
+function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
     _deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
 
     return add_theme_support( 'custom-background', array(
-        'callback' => $callback,
-        'admin-header-callback' => $admin_header_callback,
-        'admin-image-div-callback' => $admin_image_div_callback,
+        'wp-head-callback' => $wp_head_callback,
+        'admin-head-callback' => $admin_head_callback,
+        'admin-preview-callback' => $admin_preview_callback,
     ) );
 }

trunk/wp-includes/theme.php

@@ -1297 +1297 @@
                 'header-text' => true,
                 'uploads' => true,
-                'callback' => '',
-                'admin-header-callback' => '',
-                'admin-image-div-callback' => '',
+                'wp-head-callback' => '',
+                'admin-head-callback' => '',
+                'admin-preview-callback' => '',
             );
 
@@ -1367 +1367 @@
                 'default-image' => '',
                 'default-color' => '',
-                'callback' => '',
-                'admin-header-callback' => '',
-                'admin-image-div-callback' => '',
+                'wp-head-callback' => '_custom_background_cb',
+                'admin-head-callback' => '',
+                'admin-preview-callback' => '',
             );
 
@@ -1392 +1392 @@
                 define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
 
-            if ( empty( $args[0]['callback'] ) )
-                $args[0]['callback'] = '_custom_background_cb';
-
             break;
     }
@@ -1415 +1412 @@
 
         $args = get_theme_support( 'custom-header' );
-        if ( $args[0]['callback'] )
-            add_action( 'wp_head', $args[0]['callback'] );
+        if ( $args[0]['wp-head-callback'] )
+            add_action( 'wp_head', $args[0]['wp-head-callback'] );
 
         if ( is_admin() ) {
             require_once( ABSPATH . 'wp-admin/custom-header.php' );
-            $custom_image_header = new Custom_Image_Header( $args[0]['admin-header-callback'], $args[0]['admin-image-div-callback'] );
+            $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
         }
     }
@@ -1429 +1426 @@
 
         $args = get_theme_support( 'custom-background' );
-        add_action( 'wp_head', $args[0]['callback'] );
+        add_action( 'wp_head', $args[0]['wp-head-callback'] );
 
         if ( is_admin() ) {
             require_once( ABSPATH . 'wp-admin/custom-background.php' );
-            $custom_background = new Custom_Background( $args[0]['admin-header-callback'], $args[0]['admin-image-div-callback'] );
+            $custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
         }
     }
@@ -1510 +1507 @@
         case 'custom-header' :
             $support = get_theme_support( 'custom-header' );
-            if ( $support[0]['callback'] )
-                remove_action( 'wp_head', $support[0]['callback'] );
+            if ( $support[0]['wp-head-callback'] )
+                remove_action( 'wp_head', $support[0]['wp-head-callback'] );
             remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
             unset( $GLOBALS['custom_image_header'] );
@@ -1518 +1515 @@
         case 'custom-background' :
             $support = get_theme_support( 'custom-background' );
-            remove_action( 'wp_head', $support[0]['callback'] );
+            remove_action( 'wp_head', $support[0]['wp-head-callback'] );
             remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
             unset( $GLOBALS['custom_background'] );