summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2011-01-27 02:07:03 (GMT)
committer sun2011-01-27 02:07:03 (GMT)
commit88421acf4f3fff94f6f2fa8e1de416620e0352ab (patch)
tree5a95b5d7670358afa11107f7bf07851764da69e6
parent069a9235bd6ec626a65dbcf28b15507a7b66911f (diff)
Preparing new release.
-rw-r--r--CHANGELOG.txt4
-rw-r--r--libraries.info2
-rw-r--r--libraries.module12
3 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3ea10ee..4505fba 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,10 +1,10 @@
// $Id$
-Libraries x.x-x.x, xxxx-xx-xx
+Libraries 6.x-1.x, xxxx-xx-xx
-----------------------------
-Libraries 6.x-1.x, xxxx-xx-xx
+Libraries 6.x-1.0, 2010-01-27
-----------------------------
#496732 by tstoeckler, robphillips: Allow placing libraries in root directory.
diff --git a/libraries.info b/libraries.info
index f135042..5a5bd6b 100644
--- a/libraries.info
+++ b/libraries.info
@@ -1,4 +1,4 @@
; $Id$
name = Libraries
-description = External library handling for Drupal modules.
+description = Allows version dependent and shared usage of external libraries.
core = 6.x
diff --git a/libraries.module b/libraries.module
index d93b26e..c7990ad 100644
--- a/libraries.module
+++ b/libraries.module
@@ -9,8 +9,8 @@
/**
* Helper function to build paths to libraries.
*
- * @param $library
- * The external library name to return the path for.
+ * @param $name
+ * The machine name of a library to return the path for.
* @param $base_path
* Whether to prefix the resulting path with base_path().
*
@@ -19,7 +19,7 @@
*
* @ingroup libraries
*/
-function libraries_get_path($library, $base_path = FALSE) {
+function libraries_get_path($name, $base_path = FALSE) {
static $libraries;
if (!isset($libraries)) {
@@ -27,13 +27,13 @@ function libraries_get_path($library, $base_path = FALSE) {
}
$path = ($base_path ? base_path() : '');
- if (!isset($libraries[$library])) {
+ if (!isset($libraries[$name])) {
// Most often, external libraries can be shared across multiple sites, so
// we return sites/all/libraries as the default path.
- $path .= 'sites/all/libraries/' . $library;
+ $path .= 'sites/all/libraries/' . $name;
}
else {
- $path .= $libraries[$library];
+ $path .= $libraries[$name];
}
return $path;