Changeset 26594 for trunk/src/wp-includes/theme.php

Timestamp:

12/03/2013 09:35:26 PM (11 years ago)

Author:

nacin

Message:

Rename the new custom-background arguments passed to add_theme_support().

• background-position becomes default-position-x
• background-attachment becomes default-attachment
• background-repeat becomes default-repeat

These are in line with existing default-image and default-color arguments, and also makes the position argument unambiguous and forwards compatible.

fixes #20816.

File:

• trunk/src/wp-includes/theme.php (modified) (2 diffs)

trunk/src/wp-includes/theme.php

@@ -1281 +1281 @@
         $image = " background-image: url('$background');";
 
-        $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) );
+        $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
         if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
             $repeat = 'repeat';
         $repeat = " background-repeat: $repeat;";
 
-        $position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) );
+        $position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
         if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
             $position = 'left';
         $position = " background-position: top $position;";
 
-        $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) );
+        $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
         if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
             $attachment = 'scroll';
@@ -1484 +1484 @@
             $defaults = array(
                 'default-image'          => '',
-                'background-repeat'      => 'repeat',
-                'background-position'    => 'left',
-                'background-attachment'  => 'scroll',
+                'default-repeat'         => 'repeat',
+                'default-position-x'     => 'left',
+                'default-attachment'     => 'scroll',
                 'default-color'          => '',
                 'wp-head-callback'       => '_custom_background_cb',