From 86bb996446a39c31b4e04ae573b682e994121f2b Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sun, 20 Sep 2015 16:54:24 +0000
Subject: [PATCH] Implement some more uses of `wp_login_url()` in places where
 wp-login.php is hard-coded.

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
---
 wp-admin/install.php    | 4 ++--
 wp-includes/version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/install.php b/wp-admin/install.php
index 08da49a0d4..90ed449e4a 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -190,7 +190,7 @@ function display_setup_form( $error = null ) {
 // Let's check to make sure WP isn't already installed.
 if ( is_blog_installed() ) {
 	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>
 </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
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 69db5d6f9d..c3c50232ee 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.