Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Pinking Shears.

Browse Source 
See #30799.

Built from https://develop.svn.wordpress.org/trunk@31077


git-svn-id: http://core.svn.wordpress.org/trunk@31058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-08 05:03:23 +00:00
parent 9b0e279e82
commit ff98cfcf45
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/file.php
View File

@ -925,7 +925,7 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe
} }
if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) { if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
// WordPress is creating files as the same owner as the WordPress files, // WordPress is creating files as the same owner as the WordPress files,
// this means it's safe to modify & create new files via PHP. // this means it's safe to modify & create new files via PHP.
$method = 'direct'; $method = 'direct';
$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner'; $GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';

2
wp-admin/includes/meta-boxes.php
View File

@ -755,7 +755,7 @@ function page_attributes_meta_box($post) {
* include 'meta-box' or 'quick-edit'. * include 'meta-box' or 'quick-edit'.
*/ */
$default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'meta-box' ); $default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'meta-box' );
?> ?>
<option value="default"><?php echo esc_html( $default_title ); ?></option> <option value="default"><?php echo esc_html( $default_title ); ?></option>
<?php page_template_dropdown($template); ?> <?php page_template_dropdown($template); ?>
</select> </select>

2
wp-admin/theme-install.php
View File

@ -245,7 +245,7 @@ if ( $tab ) {
<# } else { #> <# } else { #>
<div class="rating"> <div class="rating">
<small class="ratings"><?php _e( 'This theme has not been rated yet.' ); ?></small> <small class="ratings"><?php _e( 'This theme has not been rated yet.' ); ?></small>
</div> </div>
<# } #> <# } #>
<div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div> <div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div>
<div class="theme-description">{{{ data.description }}}</div> <div class="theme-description">{{{ data.description }}}</div>

2
wp-includes/class-wp-customize-manager.php
View File

@ -672,7 +672,7 @@ final class WP_Customize_Manager {
/** /**
* Filter response data for a successful customize_save Ajax request. * Filter response data for a successful customize_save Ajax request.
* *
* This filter does not apply if there was a nonce or authentication failure. * This filter does not apply if there was a nonce or authentication failure.
* *
* @since 4.2.0 * @since 4.2.0

2
wp-includes/locale.php
View File

@ -88,7 +88,7 @@ class WP_Locale {
* @var array * @var array
*/ */
var $number_format; var $number_format;
/** /**
* Sets up the translated strings and object properties. * Sets up the translated strings and object properties.
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31075'; $wp_version = '4.2-alpha-31077';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

2
wp-includes/widgets.php
View File

@ -166,7 +166,7 @@ class WP_Widget {
/** /**
* PHP4 constructor * PHP4 constructor
* *
* @param string $id_base * @param string $id_base
* @param string $name * @param string $name
* @param array $widget_options * @param array $widget_options