From cf4f209d1693331122f53197dc98ade483eb0462 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 18 Jan 2009 06:56:58 +0000
Subject: [PATCH] #310863 by bangpound, dboulet, and catch: Stop locale module
 from auto-installing with custom install profiles.

---
 includes/install.inc           |  2 +-
 profiles/expert/expert.profile | 49 ----------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/includes/install.inc b/includes/install.inc
index 4299cfd1b21..959e4e006dc 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -434,7 +434,7 @@ function drupal_get_profile_modules($profile, $locale = 'en') {
 
   // Get a list of modules required by this profile.
   $function = $profile . '_profile_modules';
-  return array_merge(drupal_required_modules(), $function(), ($locale != 'en' ? array('locale') : array()));
+  return array_merge(drupal_required_modules(), $function(), ($locale != 'en' && !empty($locale) ? array('locale') : array()));
 }
 
 /**
diff --git a/profiles/expert/expert.profile b/profiles/expert/expert.profile
index afc3b34c2c6..a8d733a3c5f 100644
--- a/profiles/expert/expert.profile
+++ b/profiles/expert/expert.profile
@@ -40,57 +40,8 @@ function expert_profile_task_list() {
 
 /**
  * Perform any final installation tasks for this profile.
- *
- * The installer goes through the profile-select -> locale-select
- * -> requirements -> database -> profile-install-batch
- * -> locale-initial-batch -> configure -> locale-remaining-batch
- * -> finished -> done tasks, in this order, if you don't implement
- * this function in your profile.
- *
- * If this function is implemented, you can have any number of
- * custom tasks to perform after 'configure', implementing a state
- * machine here to walk the user through those tasks. First time,
- * this function gets called with $task set to 'profile', and you
- * can advance to further tasks by setting $task to your tasks'
- * identifiers, used as array keys in the hook_profile_task_list()
- * above. You must avoid the reserved tasks listed in
- * install_reserved_tasks(). If you implement your custom tasks,
- * this function will get called in every HTTP request (for form
- * processing, printing your information screens and so on) until
- * you advance to the 'profile-finished' task, with which you
- * hand control back to the installer. Each custom page you
- * return needs to provide a way to continue, such as a form
- * submission or a link. You should also set custom page titles.
- *
- * You should define the list of custom tasks you implement by
- * returning an array of them in hook_profile_task_list(), as these
- * show up in the list of tasks on the installer user interface.
- *
- * Remember that the user will be able to reload the pages multiple
- * times, so you might want to use variable_set() and variable_get()
- * to remember your data and control further processing, if $task
- * is insufficient. Should a profile want to display a form here,
- * it can; the form should set '#redirect' to FALSE, and rely on
- * an action in the submit handler, such as variable_set(), to
- * detect submission and proceed to further tasks. See the configuration
- * form handling code in install_tasks() for an example.
- *
- * Important: Any temporary variables should be removed using
- * variable_del() before advancing to the 'profile-finished' phase.
- *
- * @param $task
- *   The current $task of the install system. When hook_profile_tasks()
- *   is first called, this is 'profile'.
- * @param $url
- *   Complete URL to be used for a link or form action on a custom page,
- *   if providing any, to allow the user to proceed with the installation.
- *
- * @return
- *   An optional HTML string to display to the user. Only used if you
- *   modify the $task, otherwise discarded.
  */
 function expert_profile_tasks(&$task, $url) {
-  module_disable(array('locale'));
 }
 
 /**