From 52e91afc55235d88879058b45d2e351ff1319dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20St=C3=B6ckler?= <tobiasstoeckler@googlemail.com>
Date: Wed, 4 Nov 2015 21:24:22 +0100
Subject: [PATCH] Issue #2606420 by googletorp, tstoeckler: Fix profile library
detection
---
CHANGELOG.txt | 1 +
libraries.module | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 978f99d..3200921 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
Libraries 8.x-3.x, xxxx-xx-xx
-----------------------------
+#2606420 by googletorp, tstoeckler: Fix profile library detection
#2090623 by tstoeckler: Add an external library registry
#2572401 by rjacobs, yas: Fix missing @group annotation in PhpFileLibraryTest
#2090623 by tstoeckler: Add a test for PHP file loading
diff --git a/libraries.module b/libraries.module
index 4e5cc39..198e483 100644
--- a/libraries.module
+++ b/libraries.module
@@ -82,8 +82,8 @@ function libraries_get_libraries() {
// profile, installation profiles may want to place libraries into a
// 'libraries' directory.
if ($profile = drupal_get_profile()) {
- drupal_get_path('profile', $profile);
- $searchdir[] = "$profile/libraries";
+ $profile_path = drupal_get_path('profile', $profile);
+ $searchdir[] = "$profile_path/libraries";
};
// Search sites/all/libraries for backwards-compatibility.
--
GitLab