Changeset 20221 for trunk/wp-includes/theme.php

Timestamp:

03/20/2012 08:34:49 PM (14 years ago)

Author:

nacin

Message:

In new add_theme_support() logic, fix logic inversion, define HEADER_IMAGE in a simpler way, and force args to be an array. see #20249.

File:

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

trunk/wp-includes/theme.php

@@ -1284 +1284 @@
 
                 case 'custom-header' :
+                        if ( ! is_array( $args ) )
+                                $args = array( 0 => array() );
+
                         $defaults = array(
                                 'default-image' => '',
@@ -1330 +1333 @@
                         if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
                                 $args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-                        elseif ( ! isset( $args[0]['height'] ) )
+                        elseif ( isset( $args[0]['height'] ) )
                                 define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
 
@@ -1340 +1343 @@
                         if ( defined( 'HEADER_IMAGE' ) )
                                 $args[0]['default-image'] = HEADER_IMAGE;
+                        elseif ( isset( $args[0]['default-image'] ) )
+                                define( 'HEADER_IMAGE', $args[0]['default-image'] );
 
                         if ( $jit && ! empty( $args[0]['default-image'] ) )
                                 $args[0]['random-default'] = false;
-
-                        if ( ! defined( 'HEADER_IMAGE' ) && ( isset( $args[0]['default-image'] ) || isset( $args[0]['random-default'] ) ) )
-                                define( 'HEADER_IMAGE', $args[0]['default-image'] );
 
                         // If headers are supported, and we still don't have a defined width or height,
@@ -1359 +1361 @@
 
                 case 'custom-background' :
+                        if ( ! is_array( $args ) )
+                                $args = array( 0 => array() );
+
                         $defaults = array(
                                 'default-image' => '',