Merge two similar strings.
props pavelevap. fixes #33643. Built from https://develop.svn.wordpress.org/trunk@33842 git-svn-id: http://core.svn.wordpress.org/trunk@33810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
ecf0b82afb
commit
32b5726fd4
|
@ -89,7 +89,7 @@ $id = media_handle_upload( 'async-upload', $post_id );
|
||||||
if ( is_wp_error($id) ) {
|
if ( is_wp_error($id) ) {
|
||||||
echo '<div class="error-div error">
|
echo '<div class="error-div error">
|
||||||
<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
|
<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
|
||||||
<strong>' . sprintf(__('“%s” has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
|
<strong>' . sprintf(__('“%s” has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
|
||||||
esc_html($id->get_error_message()) . '</div>';
|
esc_html($id->get_error_message()) . '</div>';
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.4-alpha-33841';
|
$wp_version = '4.4-alpha-33842';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
|
Loading…
Reference in New Issue