mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-22 09:07:59 +01:00
The Pinking Shears stir from their slumber, awakened by what may seem, to those
innocent in the ways of The Shears, a triviality, a nothing-of-consequence. But there are consequences indeed for recklessly trailing your whitespace. Naturally, they a dire! One, two! One, two! And through and through The Pinking Shears went snicker-snack! They plucked your tail and with your space They went sniksnuking back. Let me tell you, that can be uncomfortable, so always pre-sniksnuk your trailing whites. May The Shears be with you. Built from https://develop.svn.wordpress.org/trunk@26851 git-svn-id: http://core.svn.wordpress.org/trunk@26738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
aec9b195ef
commit
07c16fd23c
@ -29,7 +29,7 @@
|
||||
}
|
||||
|
||||
.wp-color-result:after {
|
||||
background: #f7f7f7;
|
||||
background: #f7f7f7;
|
||||
border-radius: 2px 0 0 2px;
|
||||
border-right: 1px solid #ccc;
|
||||
color: #555;
|
||||
|
@ -29,7 +29,7 @@
|
||||
}
|
||||
|
||||
.wp-color-result:after {
|
||||
background: #f7f7f7;
|
||||
background: #f7f7f7;
|
||||
border-radius: 0 2px 2px 0;
|
||||
border-left: 1px solid #ccc;
|
||||
color: #555;
|
||||
|
@ -212,7 +212,7 @@ ul#adminmenu {
|
||||
|
||||
.theme-browser .theme .theme-screenshot {
|
||||
height: 180px;
|
||||
min-width:
|
||||
min-width:
|
||||
}
|
||||
|
||||
.theme-browser .theme .theme-actions {
|
||||
|
@ -212,7 +212,7 @@ ul#adminmenu {
|
||||
|
||||
.theme-browser .theme .theme-screenshot {
|
||||
height: 180px;
|
||||
min-width:
|
||||
min-width:
|
||||
}
|
||||
|
||||
.theme-browser .theme .theme-actions {
|
||||
|
@ -1902,7 +1902,7 @@ class WP_Automatic_Updater {
|
||||
|
||||
// if the filesystem is unavailable, false is returned.
|
||||
if ( false === $upgrade_result ) {
|
||||
$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
|
||||
$upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
|
||||
}
|
||||
|
||||
// Core doesn't output this, so lets append it so we don't get confused
|
||||
|
@ -808,7 +808,7 @@ function delete_plugins($plugins, $redirect = '' ) {
|
||||
if ( $current = get_site_transient('update_plugins') ) {
|
||||
// Don't remove the plugins that weren't deleted.
|
||||
$deleted = array_diff( $plugins, $errors );
|
||||
|
||||
|
||||
foreach ( $deleted as $plugin_file ) {
|
||||
unset( $current->response[ $plugin_file ] );
|
||||
}
|
||||
|
@ -311,7 +311,7 @@ function themes_api( $action, $args = null ) {
|
||||
* 'feature_list', or 'query_themes'.
|
||||
*/
|
||||
$args = apply_filters( 'themes_api_args', $args, $action );
|
||||
|
||||
|
||||
/**
|
||||
* Filter whether to override the WordPress.org Themes API.
|
||||
*
|
||||
|
@ -374,7 +374,7 @@ jQuery(document).ready( function($) {
|
||||
e.preventDefault();
|
||||
}
|
||||
}).filter(':visible').find('.wp-tab-first').focus();
|
||||
|
||||
|
||||
// Set the heartbeat interval to 15 sec. if post lock dialogs are enabled
|
||||
if ( typeof wp !== 'undefined' && wp.heartbeat && $('#post-lock-dialog').length ) {
|
||||
wp.heartbeat.interval( 15 );
|
||||
|
@ -440,7 +440,7 @@ wpWidgets = {
|
||||
// No longer "new" widget
|
||||
widget.find( 'input.add_new' ).val('');
|
||||
|
||||
/*
|
||||
/*
|
||||
* Check if any part of the sidebar is visible in the viewport. If it is, don't scroll.
|
||||
* Otherwise, scroll up to so the sidebar is in view.
|
||||
*
|
||||
@ -450,7 +450,7 @@ wpWidgets = {
|
||||
viewportTop = $(window).scrollTop();
|
||||
viewportBottom = viewportTop + $(window).height();
|
||||
sidebarBounds = sidebar.offset();
|
||||
|
||||
|
||||
sidebarBounds.bottom = sidebarBounds.top + sidebar.outerHeight();
|
||||
|
||||
if ( viewportTop > sidebarBounds.bottom || viewportBottom < sidebarBounds.top ) {
|
||||
|
@ -279,7 +279,7 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
|
||||
<# } #>
|
||||
<span class="more-details"><?php _e( 'Theme Details' ); ?></span>
|
||||
<div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
|
||||
|
||||
|
||||
<# if ( data.active ) { #>
|
||||
<h3 class="theme-name"><span><?php _ex( 'Active:', 'theme' ); ?></span> {{{ data.name }}}</h3>
|
||||
<# } else { #>
|
||||
|
@ -490,7 +490,7 @@ get_current_screen()->set_help_sidebar(
|
||||
if ( 'upgrade-core' == $action ) {
|
||||
// Force a update check when requested
|
||||
$force_check = ! empty( $_GET['force-check'] );
|
||||
wp_version_check( array(), $force_check );
|
||||
wp_version_check( array(), $force_check );
|
||||
|
||||
require_once(ABSPATH . 'wp-admin/admin-header.php');
|
||||
?>
|
||||
|
@ -370,7 +370,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
|
||||
return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
|
||||
}
|
||||
elseif ( 'image/jpeg' == $mime_type ) {
|
||||
if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) )
|
||||
if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) )
|
||||
return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
|
||||
}
|
||||
else {
|
||||
|
@ -119,7 +119,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
|
||||
if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
|
||||
return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
|
||||
|
||||
/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
|
||||
/** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */
|
||||
// Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
|
||||
@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
|
||||
|
||||
@ -452,7 +452,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
|
||||
$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
|
||||
@ chmod( $filename, $perms );
|
||||
|
||||
/** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
|
||||
/** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
|
||||
return array(
|
||||
'path' => $filename,
|
||||
'file' => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
|
||||
|
@ -1867,7 +1867,7 @@ function translate_smiley( $matches ) {
|
||||
* @param string $smiley_url URL for the smiley image.
|
||||
* @param string $img Filename for the smiley image.
|
||||
* @param string $site_url Site URL, as returned by site_url().
|
||||
*/
|
||||
*/
|
||||
$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
|
||||
|
||||
return sprintf( ' <img src="%s" alt="%s" class="wp-smiley" /> ', esc_url( $src_url ), esc_attr( $smiley ) );
|
||||
|
@ -2250,7 +2250,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
|
||||
|
||||
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08);
|
||||
box-shadow: inset 0 1px 0 #fff, 0 1px 0 rgba(0,0,0,.08);
|
||||
vertical-align: top;
|
||||
|
@ -7,7 +7,7 @@
|
||||
<supportsKeywords>Yes</supportsKeywords>
|
||||
<supportsGetTags>Yes</supportsGetTags>
|
||||
</options>
|
||||
|
||||
|
||||
<weblog>
|
||||
<serviceName>WordPress</serviceName>
|
||||
<imageUrl>images/wlw/wp-icon.png</imageUrl>
|
||||
@ -15,13 +15,13 @@
|
||||
<homepageLinkText>View site</homepageLinkText>
|
||||
<adminLinkText>Dashboard</adminLinkText>
|
||||
<adminUrl>
|
||||
<![CDATA[
|
||||
{blog-postapi-url}/../wp-admin/
|
||||
<![CDATA[
|
||||
{blog-postapi-url}/../wp-admin/
|
||||
]]>
|
||||
</adminUrl>
|
||||
<postEditingUrl>
|
||||
<![CDATA[
|
||||
{blog-postapi-url}/../wp-admin/post.php?action=edit&post={post-id}
|
||||
<![CDATA[
|
||||
{blog-postapi-url}/../wp-admin/post.php?action=edit&post={post-id}
|
||||
]]>
|
||||
</postEditingUrl>
|
||||
</weblog>
|
||||
@ -32,7 +32,7 @@
|
||||
<text>Manage Comments</text>
|
||||
<imageUrl>images/wlw/wp-comments.png</imageUrl>
|
||||
<clickUrl>
|
||||
<![CDATA[
|
||||
<![CDATA[
|
||||
{blog-postapi-url}/../wp-admin/edit-comments.php
|
||||
]]>
|
||||
</clickUrl>
|
||||
|
Loading…
Reference in New Issue
Block a user