Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-14 22:56:19 +01:00
Code Issues Projects Releases Wiki Activity

Implement some more uses of wp_login_url() in places where wp-login.php is hard-coded.

Browse Source 
See #31495

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


git-svn-id: http://core.svn.wordpress.org/trunk@34322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2015-09-20 16:54:24 +00:00
parent 015349cd6e
commit 86bb996446
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-admin/install.php
View File

@ -190,7 +190,7 @@ function display_setup_form( $error = null ) {
// Let's check to make sure WP isn't already installed. // Let's check to make sure WP isn't already installed.
if ( is_blog_installed() ) { if ( is_blog_installed() ) {
display_header(); display_header();
die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' ); die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="' . esc_url( wp_login_url() ) . '" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' );
} }
/** /**
@ -341,7 +341,7 @@ switch($step) {
</tr> </tr>
</table> </table>
<p class="step"><a href="../wp-login.php" class="button button-large"><?php _e( 'Log In' ); ?></a></p> <p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
<?php <?php
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34357'; $wp_version = '4.4-alpha-34358';
/** /**
* 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.