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

Multisite: Show always domain and path when deleting a site. 

Add a missing translators comment.

Props ian.edington.
Fixes #37309.
Built from https://develop.svn.wordpress.org/trunk@38633


git-svn-id: http://core.svn.wordpress.org/trunk@38576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-09-20 19:55:29 +00:00
parent 63664c1282
commit 7cbecfa33e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/ms-delete-site.php
View File

@ -85,7 +85,13 @@ Webmaster
<form method="post" name="deletedirect"> <form method="post" name="deletedirect">
<?php wp_nonce_field( 'delete-blog' ) ?> <?php wp_nonce_field( 'delete-blog' ) ?>
<input type="hidden" name="action" value="deleteblog" /> <input type="hidden" name="action" value="deleteblog" />
<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $blog->domain : $blog->domain . $blog->path ); ?></strong></label></p> <p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php
printf(
/* translators: %s: site address */
__( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ),
$blog->domain . $blog->path
);
?></strong></label></p>
<?php submit_button( __( 'Delete My Site Permanently' ) ); ?> <?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
</form> </form>
<?php <?php

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38632'; $wp_version = '4.7-alpha-38633';
/** /**
* 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.