summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-01-18 06:56:58 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-01-18 06:56:58 +0000
commitcf4f209d1693331122f53197dc98ade483eb0462 (patch)
tree4a571f9ce108765d66cff2ab0692cd5e6e61fde3 /includes
parentb7ab3d431f676ee59f80e6b38925c97bcf39049b (diff)
downloadbrdo-cf4f209d1693331122f53197dc98ade483eb0462.tar.gz
brdo-cf4f209d1693331122f53197dc98ade483eb0462.tar.bz2
#310863 by bangpound, dboulet, and catch: Stop locale module from auto-installing with custom install profiles.
Diffstat (limited to 'includes')
-rw-r--r--includes/install.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/install.inc b/includes/install.inc
index 4299cfd1b..959e4e006 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()));
}
/**