From 138a7961d3e775c7c059d7be1139f762a88a8cf2 Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Wed, 18 Oct 2017 20:54:57 -0400
Subject: [PATCH] CRM-21297 - Automatically fill database details in Drupal
 installer.  Update WP redirect after install

---
 install/index.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/install/index.php b/install/index.php
index d0bb8db17e..b32c4f530d 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1708,12 +1708,13 @@ class Installer extends InstallRequirements {
         $output .= "<li>" . ts("Use the <a %1>Configuration Checklist</a> to review and configure settings for your new site", array(1 => "target='_blank' href='$cmsURL'")) . "</li>";
         $output .= $commonOutputMessage;
 
-        echo '</ul>';
-        echo '</div>';
+        $output .= '</ul>';
+        $output .= '</div>';
+        echo $output;
 
         $c = CRM_Core_Config::singleton(FALSE);
         $c->free();
-        $wpInstallRedirect = admin_url("?page=CiviCRM&q=civicrm&reset=1");
+        $wpInstallRedirect = admin_url('admin.php?page=CiviCRM&q=civicrm&reset=1');
         echo "<script>
          window.location = '$wpInstallRedirect';
         </script>";
-- 
2.25.1