WordPress.org

Make WordPress Core

Changeset 21070


Ignore:
Timestamp:
06/12/2012 07:27:41 PM (6 years ago)
Author:
ryan
Message:

Pinking shears

Location:
trunk
Files:
3 edited

Legend:

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

    r21037 r21070  
    239239<?php endif; ?>
    240240
    241 <?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?> 
     241<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
    242242<?php if ( $default_image && get_background_image() != $default_image ) : ?>
    243243<tr valign="top">
  • trunk/wp-includes/class-wp-customize-manager.php

    r21069 r21070  
    161161            add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
    162162            add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
    163    
     163
    164164            // @link: http://core.trac.wordpress.org/ticket/20027
    165165            add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
    166166            add_filter( 'pre_option_template', array( $this, 'get_template' ) );
    167    
     167
    168168            // Handle custom theme roots.
    169169            add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
     
    191191            remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
    192192            remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
    193    
     193
    194194            // @link: http://core.trac.wordpress.org/ticket/20027
    195195            remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
    196196            remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
    197    
     197
    198198            // Handle custom theme roots.
    199199            remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
  • trunk/wp-includes/js/quicktags.dev.js

    r20451 r21070  
    11/*
    22 * Quicktags
    3  * 
     3 *
    44 * This is the HTML editor in WordPress. It can be attached to any textarea and will
    55 * append a toolbar above it. This script is self-contained (does not require external libraries).
     
    5252/**
    5353 * Inserts content at the caret in the active editor (textarea)
    54  * 
     54 *
    5555 * Added for back compatibility
    5656 * @see QTags.insertContent()
     
    6262/**
    6363 * Adds a button to all instances of the editor
    64  * 
     64 *
    6565 * Added for back compatibility, use QTags.addButton() as it gives more flexibility like type of button, button placement, etc.
    6666 * @see QTags.addButton()
    6767 */
    6868function edButton(id, display, tagStart, tagEnd, access, open) {
    69     return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );   
     69    return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );
    7070}
    7171
     
    279279    /**
    280280     * Main API function for adding a button to Quicktags
    281      * 
     281     *
    282282     * Adds qt.Button or qt.TagButton depending on the args. The first three args are always required.
    283283     * To be able to add button(s) to Quicktags, your script should be enqueued as dependent
     
    298298     * @param arg2 string optional Ending tag like "</span>"
    299299     * @param access_key string optional Access key for the button.
    300      * @param title string optional Button's title="..." 
     300     * @param title string optional Button's title="..."
    301301     * @param priority int optional Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
    302302     * @param instance string optional Limit the button to a specifric instance of Quicktags, add to all instances if not present.
    303303     * @return mixed null or the button object that is needed for back-compat.
    304      */             
     304     */
    305305    qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {
    306306        var btn;
    307        
     307
    308308        if ( !id || !display )
    309309            return;
Note: See TracChangeset for help on using the changeset viewer.