WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Restore proper conditional statement broken after [35427]. 

Unprops afercia.
See #34273.
Built from https://develop.svn.wordpress.org/trunk@35463


git-svn-id: http://core.svn.wordpress.org/trunk@35427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2015-10-30 22:06:24 +00:00
parent 37c2054778
commit f014928b44
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/media-template.php
View File

@ -190,9 +190,9 @@ function wp_print_media_templates() {
<# if ( data.message ) { #> <# if ( data.message ) { #>
<h2 class="upload-message">{{ data.message }}</h2> <h2 class="upload-message">{{ data.message }}</h2>
<# } #> <# } #>
<?php if ( ! _device_can_upload() ) : ?>
<h2 class="upload-instructions"><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></h2> <h2 class="upload-instructions"><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></h2>
<?php if ( is_multisite() && ! is_upload_space_available() ) : ?> <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
<h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2> <h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2>
<?php <?php
/** This action is documented in wp-admin/includes/media.php */ /** This action is documented in wp-admin/includes/media.php */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-beta2-35462'; $wp_version = '4.4-beta2-35463';
/** /**
* 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.