Changeset 20944

Timestamp:

05/27/2012 04:25:43 PM (12 years ago)

Author:

ryan

Message:

Shears of vigorous pinking.

Location:

trunk

Files:

• wp-admin/about.php (modified) (4 diffs)
• wp-admin/custom-header.php (modified) (2 diffs)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/js/custom-background.dev.js (modified) (2 diffs)
• wp-admin/theme-install.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

trunk/wp-admin/about.php

@@ -49 +49 @@
 <div class="changelog">
     <h3><?php _e( 'Custom Headers' ); ?></h3>
-    
+
     <div class="feature-section">
         <h4><?php _e( 'Flexible Sizes' ); ?></h4>
@@ -83 +83 @@
             <h4><?php _e( 'Themes API' ); ?></h4>
             <p><?php _e( 'WP_Theme, wp_get_themes(), wp_get_theme(). Faster, uses less memory, makes use of persistent caching.' ); ?></p>
-            
+
             <h4><?php _e( 'Faster Main Query' ); ?></h4>
             <p><?php _e( 'Post query optimized to avoid table scans.' ); ?></p>
@@ -90 +90 @@
             <h4><?php _e( 'Custom Header and Background API' ); ?></h4>
             <p><?php  _e( 'Custom header and background API relocated into the theme support API.' ); ?></p>
-            
+
             <h4><?php _e( 'Faster Translations' ); ?></h4>
             <p><?php _e( 'The number of strings loaded on the front end was greatly reduced, resulting in faster front page load times for localized installations.' ); ?></p>
@@ -97 +97 @@
             <h4><?php _e( 'WP_Screen API' ); ?></h4>
             <p><?php _e( 'More methods, more convenience!' ); ?></p>
-            
+
             <h4><?php _e( 'External Libraries' ); ?></h4>
             <p><?php _e( 'jQuery, jQuery UI, TinyMCE, Plupload, PHPMailer, SimplePie, and other libraries were updated. jQuery UI Touch Punch was introduced.' ); ?></p>

trunk/wp-admin/custom-header.php

@@ -112 +112 @@
                 '<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>'
         ) );
-        
+
         get_current_screen()->add_help_tab( array(
             'id'      => 'set-header-image',
@@ -122 +122 @@
                 '<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>'
         ) );
-        
+
         get_current_screen()->add_help_tab( array(
             'id'      => 'set-header-text',

trunk/wp-admin/includes/image.php

@@ -441 +441 @@
 function _copy_image_file( $attachment_id ) {
     $dst_file = $src_file = get_attached_file( $attachment_id );
-    if ( ! file_exists( $src_file ) ) 
+    if ( ! file_exists( $src_file ) )
         $src_file = _load_image_to_edit_path( $attachment_id );
 
     if ( $src_file ) {
         $dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
-        $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) ); 
+        $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
         if ( ! @copy( $src_file, $dst_file ) )
             $dst_file = false;

trunk/wp-admin/js/custom-background.dev.js

@@ -17 +17 @@
 
     $(document).ready(function() {
-    
+
         $('#pickcolor').click(function() {
             $('#colorPickerDiv').show();
             return false;
         });
-    
+
         $('#clearcolor a').click( function(e) {
             pickColor( $('#defaultcolor').val(), true );
             e.preventDefault();
         });
-    
+
         $('#background-color').keyup(function() {
             var _hex = $('#background-color').val(), hex = _hex;
@@ -38 +38 @@
                 pickColor( hex );
         });
-    
+
         $('input[name="background-position-x"]').change(function() {
             $('#custom-background-image').css('background-position', $(this).val() + ' top');
         });
-    
+
         $('input[name="background-repeat"]').change(function() {
             $('#custom-background-image').css('background-repeat', $(this).val());
         });
-    
+
         farbtastic = $.farbtastic('#colorPickerDiv', function(color) {
             pickColor(color);
         });
         pickColor($('#background-color').val());
-    
+
         $(document).mousedown(function(){
             $('#colorPickerDiv').each(function(){

trunk/wp-admin/theme-install.php

@@ -37 +37 @@
 do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
 
-$help_overview = 
+$help_overview =
     '<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'http://wordpress.org/extend/themes/') . '</p>' .
     '<p>' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '</p>' .

trunk/wp-includes/formatting.php

@@ -2144 +2144 @@
     $original_text = $text;
     $text = wp_strip_all_tags( $text );
-    /* translators: If your word count is based on single characters (East Asian characters), 
-       enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */ 
+    /* translators: If your word count is based on single characters (East Asian characters),
+       enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
     if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
         $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );

trunk/wp-includes/link-template.php

@@ -2202 +2202 @@
  *
  * @since 3.4.0
- * 
+ *
  * @param string $url Absolute url that includes a scheme
  * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.