summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--libraries.module5
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a7e2666..3ea10ee 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Libraries x.x-x.x, xxxx-xx-xx
Libraries 6.x-1.x, xxxx-xx-xx
-----------------------------
+#496732 by tstoeckler, robphillips: Allow placing libraries in root directory.
Libraries 6.x-1.0-ALPHA1, 2009-12-30
diff --git a/libraries.module b/libraries.module
index c2b7b17..d93b26e 100644
--- a/libraries.module
+++ b/libraries.module
@@ -71,6 +71,11 @@ function libraries_get_libraries() {
$searchdir = array();
$config = conf_path();
+ // Similar to 'modules' and 'themes' directories in the root directory,
+ // certain distributions may want to place libraries into a 'libraries'
+ // directory in Drupal's root directory.
+ $searchdir[] = $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