Make WordPress Core


Ignore:
Timestamp:
04/28/2011 11:02:16 PM (13 years ago)
Author:
ryan
Message:

Allow selecting previously uploader headers and randomly serving previously uploaded or default headers. Props lancewillett. see #17240

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/custom-header.php

    r17748 r17757  
    4242     */
    4343    var $default_headers = array();
     44
     45
     46    /**
     47     * Holds custom headers uploaded by the user
     48     *
     49     * @var array
     50     * @since 3.2.0
     51     * @access private
     52     */
     53    var $uploaded_headers = array();
    4454
    4555    /**
     
    200210        }
    201211
    202         if ( isset($_POST['default-header']) ) {
     212        if ( isset( $_POST['default-header'] ) ) {
    203213            check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
    204             $this->process_default_headers();
    205             if ( isset($this->default_headers[$_POST['default-header']]) )
    206                 set_theme_mod('header_image', esc_url($this->default_headers[$_POST['default-header']]['url']));
     214            if ( 'random-default-image' == $_POST['default-header'] ) {
     215                set_theme_mod( 'header_image', 'random-default-image' );
     216            } elseif ( 'random-uploaded-image' == $_POST['default-header'] ) {
     217                set_theme_mod( 'header_image', 'random-uploaded-image' );
     218            } else {
     219                $this->process_default_headers();
     220                $uploaded = get_uploaded_header_images();
     221                if ( isset( $uploaded[$_POST['default-header']] ) )
     222                    set_theme_mod( 'header_image', esc_url( $uploaded[$_POST['default-header']]['url'] ) );
     223                elseif ( isset( $this->default_headers[$_POST['default-header']] ) )
     224                    set_theme_mod( 'header_image', esc_url( $this->default_headers[$_POST['default-header']]['url'] ) );
     225            }
    207226        }
    208227    }
     
    227246            $this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], get_template_directory_uri(), get_stylesheet_directory_uri() );
    228247        }
     248
    229249    }
    230250
     
    232252     * Display UI for selecting one of several default headers.
    233253     *
     254     * Show the random image option if this theme has multiple header images.
     255     * Random image option is on by default if no header has been set.
     256     *
    234257     * @since 3.0.0
    235258     */
    236     function show_default_header_selector() {
     259    function show_header_selector( $type = 'default' ) {
    237260        echo '<div id="available-headers">';
    238         foreach ( $this->default_headers as $header_key => $header ) {
     261        if ( 'default' == $type ) {
     262            $headers = $this->default_headers;
     263        } else {
     264            $headers = get_uploaded_header_images();
     265            $type = 'uploaded';
     266        }
     267
     268        foreach ( $headers as $header_key => $header ) {
    239269            $header_thumbnail = $header['thumbnail_url'];
    240270            $header_url = $header['url'];
    241             $header_desc = $header['description'];
     271            $header_desc = empty( $header['description'] ) ? '' : $header['description'];
    242272            echo '<div class="default-header">';
    243             echo '<label><input name="default-header" type="radio" value="' . esc_attr($header_key) . '" ' . checked($header_url, get_theme_mod( 'header_image' ), false) . ' />';
    244             echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr($header_desc) .'" title="' . esc_attr($header_desc) .'" /></label>';
     273            echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
     274            $width = '';
     275            if ( !empty( $header['uploaded'] ) )
     276                $width = ' width="230"';
     277            echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
     278            echo '</div>';
     279        }
     280        if ( 1 < count( $headers ) ) {
     281            echo '<div class="default-header">';
     282            echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
     283            echo __( '<strong>Random:</strong> Show a different image on each page.' );
     284            echo '</label>';
    245285            echo '</div>';
    246286        }
     
    481521<table class="form-table">
    482522<tbody>
    483     <?php if ( ! empty( $this->default_headers ) ) : ?>
     523    <?php if ( get_uploaded_header_images() ) : ?>
     524<tr valign="top">
     525<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
     526<td>
     527    <p><?php _e( 'You can use one of your previously uploaded headers.' ) ?></p>
     528    <?php
     529        $this->show_header_selector( 'uploaded' );
     530    ?>
     531</td>
     532</tr>
     533    <?php endif;
     534    if ( ! empty( $this->default_headers ) ) : ?>
    484535<tr valign="top">
    485536<th scope="row"><?php _e( 'Default Images' ); ?></th>
     
    491542<?php endif; ?>
    492543    <?php
    493         $this->show_default_header_selector();
     544        $this->show_header_selector( 'default' );
    494545    ?>
    495546</td>
    496547</tr>
    497548    <?php endif;
    498 
    499     if ( get_header_image() ) : ?>
     549    if ( get_header_image() && !is_random_header_image() ) : ?>
    500550<tr valign="top">
    501551<th scope="row"><?php _e( 'Remove Image' ); ?></th>
     
    507557    <?php endif;
    508558
    509     if ( defined( 'HEADER_IMAGE' ) ) : ?>
     559    if ( defined( 'HEADER_IMAGE' ) && !is_random_header_image() ) : ?>
    510560<tr valign="top">
    511561<th scope="row"><?php _e( 'Reset Image' ); ?></th>
     
    694744        wp_insert_attachment($object, $cropped);
    695745        wp_update_attachment_metadata( $_POST['attachment_id'], wp_generate_attachment_metadata( $_POST['attachment_id'], $cropped ) );
     746        update_post_meta( $_POST['attachment_id'], '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
    696747
    697748        set_theme_mod('header_image', $url);
Note: See TracChangeset for help on using the changeset viewer.