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

Don't use `<a>` in translatable string in `wp-includes/ms-load.php`. 

Add translator commment.

Props ramiy.
Fixes #34506.
Built from https://develop.svn.wordpress.org/trunk@35453


git-svn-id: http://core.svn.wordpress.org/trunk@35417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-10-30 09:16:25 +00:00
parent 55a7ba2ec7
commit 80fdc4afba
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/ms-load.php
View File

@ -93,10 +93,17 @@ function ms_site_check() {
}
if ( '2' == $blog->deleted ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
return WP_CONTENT_DIR . '/blog-inactive.php';
else
wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
} else {
$admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) );
wp_die(
/* translators: %s: admin email link */
sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
sprintf( '<a href="mailto:%s">%s</a>', $admin_email )
)
);
}
}
if ( $blog->archived == '1' || $blog->spam == '1' ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-beta2-35452';
$wp_version = '4.4-beta2-35453';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.