WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pinking shears 

git-svn-id: http://core.svn.wordpress.org/trunk@21070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-06-12 19:27:41 +00:00
parent 2abd3ad571
commit 2f3839da9c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/custom-background.php
View File

@ -238,7 +238,7 @@ if ( get_background_image() ) {
</tr> </tr>
<?php endif; ?> <?php endif; ?>
<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?> <?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
<?php if ( $default_image && get_background_image() != $default_image ) : ?> <?php if ( $default_image && get_background_image() != $default_image ) : ?>
<tr valign="top"> <tr valign="top">
<th scope="row"><?php _e('Restore Original Image'); ?></th> <th scope="row"><?php _e('Restore Original Image'); ?></th>

8
wp-includes/class-wp-customize-manager.php
View File

@ -160,11 +160,11 @@ final class WP_Customize_Manager {
add_filter( 'template', array( $this, 'get_template' ) ); add_filter( 'template', array( $this, 'get_template' ) );
add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) ); add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) ); add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
// @link: http://core.trac.wordpress.org/ticket/20027 // @link: http://core.trac.wordpress.org/ticket/20027
add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) ); add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
add_filter( 'pre_option_template', array( $this, 'get_template' ) ); add_filter( 'pre_option_template', array( $this, 'get_template' ) );
// Handle custom theme roots. // Handle custom theme roots.
add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) ); add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) ); add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
@ -190,11 +190,11 @@ final class WP_Customize_Manager {
remove_filter( 'template', array( $this, 'get_template' ) ); remove_filter( 'template', array( $this, 'get_template' ) );
remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) ); remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) ); remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
// @link: http://core.trac.wordpress.org/ticket/20027 // @link: http://core.trac.wordpress.org/ticket/20027
remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) ); remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
remove_filter( 'pre_option_template', array( $this, 'get_template' ) ); remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
// Handle custom theme roots. // Handle custom theme roots.
remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) ); remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) ); remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );

16
wp-includes/js/quicktags.dev.js
View File

@ -1,6 +1,6 @@
/* /*
* Quicktags * Quicktags
* *
* This is the HTML editor in WordPress. It can be attached to any textarea and will * This is the HTML editor in WordPress. It can be attached to any textarea and will
* append a toolbar above it. This script is self-contained (does not require external libraries). * append a toolbar above it. This script is self-contained (does not require external libraries).
* *
@ -51,7 +51,7 @@ function quicktags(settings) {
/** /**
* Inserts content at the caret in the active editor (textarea) * Inserts content at the caret in the active editor (textarea)
* *
* Added for back compatibility * Added for back compatibility
* @see QTags.insertContent() * @see QTags.insertContent()
*/ */
@ -61,12 +61,12 @@ function edInsertContent(bah, txt) {
/** /**
* Adds a button to all instances of the editor * Adds a button to all instances of the editor
* *
* Added for back compatibility, use QTags.addButton() as it gives more flexibility like type of button, button placement, etc. * Added for back compatibility, use QTags.addButton() as it gives more flexibility like type of button, button placement, etc.
* @see QTags.addButton() * @see QTags.addButton()
*/ */
function edButton(id, display, tagStart, tagEnd, access, open) { function edButton(id, display, tagStart, tagEnd, access, open) {
return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 ); return QTags.addButton( id, display, tagStart, tagEnd, access, '', -1 );
} }
(function(){ (function(){
@ -278,7 +278,7 @@ function edButton(id, display, tagStart, tagEnd, access, open) {
/** /**
* Main API function for adding a button to Quicktags * Main API function for adding a button to Quicktags
* *
* Adds qt.Button or qt.TagButton depending on the args. The first three args are always required. * Adds qt.Button or qt.TagButton depending on the args. The first three args are always required.
* To be able to add button(s) to Quicktags, your script should be enqueued as dependent * To be able to add button(s) to Quicktags, your script should be enqueued as dependent
* on "quicktags" and outputted in the footer. If you are echoing JS directly from PHP, * on "quicktags" and outputted in the footer. If you are echoing JS directly from PHP,
@ -297,14 +297,14 @@ function edButton(id, display, tagStart, tagEnd, access, open) {
* @param arg1 string || function required Either a starting tag to be inserted like "<span>" or a callback that is executed when the button is clicked. * @param arg1 string || function required Either a starting tag to be inserted like "<span>" or a callback that is executed when the button is clicked.
* @param arg2 string optional Ending tag like "</span>" * @param arg2 string optional Ending tag like "</span>"
* @param access_key string optional Access key for the button. * @param access_key string optional Access key for the button.
* @param title string optional Button's title="..." * @param title string optional Button's title="..."
* @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. * @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.
* @param instance string optional Limit the button to a specifric instance of Quicktags, add to all instances if not present. * @param instance string optional Limit the button to a specifric instance of Quicktags, add to all instances if not present.
* @return mixed null or the button object that is needed for back-compat. * @return mixed null or the button object that is needed for back-compat.
*/ */
qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) { qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {
var btn; var btn;
if ( !id || !display ) if ( !id || !display )
return; return;