Message info
 
To:wp-svn@lists.automattic.com From:m@wordpress.org Subject:[wp-svn] [21070] trunk: Pinking shears Date:Tue, 12 Jun 2012 19:27:41 +0000 (UTC)
 

Revision
21070
Author
ryan
Date
2012-06-12 19:27:41 +0000 (Tue, 12 Jun 2012)

Log Message

Pinking shears

Modified Paths

Diff

Modified: trunk/wp-admin/custom-background.php (21069 => 21070)


--- trunk/wp-admin/custom-background.php	2012-06-12 18:39:16 UTC (rev 21069)
+++ trunk/wp-admin/custom-background.php	2012-06-12 19:27:41 UTC (rev 21070)
@@ -238,7 +238,7 @@
 </tr>
 <?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 ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e('Restore Original Image'); ?></th>

Modified: trunk/wp-includes/class-wp-customize-manager.php (21069 => 21070)


--- trunk/wp-includes/class-wp-customize-manager.php	2012-06-12 18:39:16 UTC (rev 21069)
+++ trunk/wp-includes/class-wp-customize-manager.php	2012-06-12 19:27:41 UTC (rev 21070)
@@ -160,11 +160,11 @@
 			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 @@
 			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' ) );

Modified: trunk/wp-includes/js/quicktags.dev.js (21069 => 21070)


--- trunk/wp-includes/js/quicktags.dev.js	2012-06-12 18:39:16 UTC (rev 21069)
+++ trunk/wp-includes/js/quicktags.dev.js	2012-06-12 19:27:41 UTC (rev 21070)
@@ -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 @@
 
 /**
  * Inserts content at the caret in the active editor (textarea)
- * 
+ *
  * Added for back compatibility
  * @see QTags.insertContent()
  */
@@ -61,12 +61,12 @@
 
 /**
  * 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 @@
 
 	/**
 	 * 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 @@
 	 * @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 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;