From 2f3839da9c346cf394a7d7e68c75f2ee2eae0927 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 12 Jun 2012 19:27:41 +0000 Subject: [PATCH] Pinking shears git-svn-id: http://core.svn.wordpress.org/trunk@21070 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/custom-background.php | 2 +- wp-includes/class-wp-customize-manager.php | 8 ++++---- wp-includes/js/quicktags.dev.js | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php index aa2d55a6e6..8fb1399b3b 100644 --- a/wp-admin/custom-background.php +++ b/wp-admin/custom-background.php @@ -238,7 +238,7 @@ if ( get_background_image() ) { - + diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 47cb30dcf0..c1ce0510e7 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -160,11 +160,11 @@ final class WP_Customize_Manager { add_filter( 'template', array( $this, 'get_template' ) ); add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) ); add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) ); - + // @link: http://core.trac.wordpress.org/ticket/20027 add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) ); add_filter( 'pre_option_template', array( $this, 'get_template' ) ); - + // Handle custom theme roots. add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_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( 'stylesheet', array( $this, 'get_stylesheet' ) ); remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) ); - + // @link: http://core.trac.wordpress.org/ticket/20027 remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) ); remove_filter( 'pre_option_template', array( $this, 'get_template' ) ); - + // Handle custom theme roots. remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) ); remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) ); diff --git a/wp-includes/js/quicktags.dev.js b/wp-includes/js/quicktags.dev.js index 10f87db690..3759c90c19 100644 --- a/wp-includes/js/quicktags.dev.js +++ b/wp-includes/js/quicktags.dev.js @@ -1,6 +1,6 @@ /* * Quicktags - * + * * 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). * @@ -51,7 +51,7 @@ function quicktags(settings) { /** * Inserts content at the caret in the active editor (textarea) - * + * * Added for back compatibility * @see QTags.insertContent() */ @@ -61,12 +61,12 @@ function edInsertContent(bah, txt) { /** * 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. * @see QTags.addButton() */ 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(){ @@ -278,7 +278,7 @@ function edButton(id, display, tagStart, tagEnd, access, open) { /** * 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. * 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, @@ -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 "" or a callback that is executed when the button is clicked. * @param arg2 string optional Ending tag like "" * @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 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. - */ + */ qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) { var btn; - + if ( !id || !display ) return;