- Patch #77549 by adrian: install profiles should be in their own directory.

1 files changed, 3 insertions, 2 deletions

diff --git a/install.php b/install.php
index ed1636af6..cff4a0ae1 100644
--- a/install.php
+++ b/install.php
@@ -54,7 +54,7 @@ function install_main() {
     _install_no_profile_error();
   }
   // Load the profile.
-  require_once "./profiles/$profile.profile";
+  require_once "./profiles/$profile/$profile.profile";
 
   // Change the settings.php information if verification failed earlier.
   if (!$verify) {
@@ -414,6 +414,8 @@ function install_already_done_error() {
  */
 function install_complete($profile) {
   global $base_url;
+  // Store install profile for later use.
+  variable_set('install_profile', $profile);
 
   // Bootstrap newly installed Drupal, while preserving existing messages.
   $messages = $_SESSION['messages'];
@@ -436,7 +438,6 @@ function install_complete($profile) {
     $msg = drupal_set_message() ? 'Please review the messages above before continuing on to <a href="%url">your new site</a>.' : 'You may now visit <a href="%url">your new site</a>.';
     $output .= strtr('<p>'. $msg .'</p>', array('%url' => url('')));
   }
-
   // Output page.
   print theme('maintenance_page', $output);
 }