diff --git a/wp-admin/about.php b/wp-admin/about.php index 59ebb937e4..f2fa7a266b 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -48,7 +48,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

- +

theme support.' ); ?>

@@ -82,21 +82,21 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

- +

- +

- +

diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 613d7a7e71..0233d2b22e 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -111,7 +111,7 @@ class Custom_Image_Header { '

' . __( 'This screen is used to customize the header section of your theme.') . '

' . '

' . __( 'You can choose from the theme’s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '

' ) ); - + get_current_screen()->add_help_tab( array( 'id' => 'set-header-image', 'title' => __('Header Image'), @@ -121,7 +121,7 @@ class Custom_Image_Header { '

' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the “Random” radio button next to the Uploaded Images or Default Images section to enable this feature.') . '

' . '

' . __( 'If you don’t want a header image to be displayed on your site at all, click the “Remove Header Image” 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 “Save Changes”.') . '

' ) ); - + get_current_screen()->add_help_tab( array( 'id' => 'set-header-text', 'title' => __('Header Text'), diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index ce721fae74..a78c180440 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -440,12 +440,12 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) { */ 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; } else { diff --git a/wp-admin/js/custom-background.dev.js b/wp-admin/js/custom-background.dev.js index e5a56dcf13..393c09f296 100644 --- a/wp-admin/js/custom-background.dev.js +++ b/wp-admin/js/custom-background.dev.js @@ -16,17 +16,17 @@ var farbtastic, pickColor; } $(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; if ( hex.charAt(0) != '#' ) @@ -37,20 +37,20 @@ var farbtastic, pickColor; if ( hex.length == 4 || hex.length == 7 ) 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(){ var display = $(this).css('display'); diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php index 3534168b54..8a5cadb5b8 100644 --- a/wp-admin/theme-install.php +++ b/wp-admin/theme-install.php @@ -36,7 +36,7 @@ $body_id = $tab; do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information. -$help_overview = +$help_overview = '

' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the WordPress.org Theme Directory. 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/') . '

' . '

' . __('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.') . '

' . '

' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your /wp-content/themes directory.') . '

'; diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 306bb0e63d..f69c9382b5 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -2143,8 +2143,8 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) { $more = __( '…' ); $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 ), ' ' ); preg_match_all( '/./u', $text, $words_array ); diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 859610377d..ae8a9f136c 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -2201,7 +2201,7 @@ function self_admin_url($path = '', $scheme = 'admin') { * Set the scheme for a URL * * @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'. * @return string $url URL with chosen scheme.