Merge remote-tracking branch 'origin/4.7.27-rc' into 4.7.27-rc-master-2017-11-02...

[civicrm-core.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index d0bb8db17eb068385f186c987678e6303d520cb2..b32c4f530d8614a12430fb3eec0b37ebe3c9882d 100644 (file)
--- 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>";