diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-06-03 02:50:21 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-06-03 02:50:21 +0000 |
| commit | d73fe8eae0492086ff195a1ca5dfa07695757bae (patch) | |
| tree | 366bdffa5e320d66a3e3647b1094049d6ee06383 /includes/common.inc | |
| parent | abe722f0b8f93e32d5a54bc974801bb831a546a1 (diff) | |
| download | brdo-d73fe8eae0492086ff195a1ca5dfa07695757bae.tar.gz brdo-d73fe8eae0492086ff195a1ca5dfa07695757bae.tar.bz2 | |
#480044 by JohnAlbin: sites/all/ should take precedence over profiles when searching for modules and themes.
Diffstat (limited to 'includes/common.inc')
| -rw-r--r-- | includes/common.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index a8a9a2466..299af56b8 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3426,9 +3426,6 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) $searchdir = array($directory); $files = array(); - // Always search sites/all/* as well as the global directories - $searchdir[] = 'sites/all/' . $directory; - // The 'profiles' directory contains pristine collections of modules and // themes as organized by a distribution. It is pristine in the same way // that /modules is pristine for core; users should avoid changing anything @@ -3437,6 +3434,9 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) $searchdir[] = "profiles/$profile/$directory"; } + // Always search sites/all/* as well as the global directories + $searchdir[] = 'sites/all/' . $directory; + if (file_exists("$config/$directory")) { $searchdir[] = "$config/$directory"; } |