Commit 6de7fb32 authored by sun's avatar sun

#1024080 by hswong3i, tstoeckler: Fixed installation profile retrieval.

parent 58d95d84
......@@ -6,6 +6,7 @@ Libraries x.x-x.x, xxxx-xx-xx
Libraries 7.x-1.x, xxxx-xx-xx
-----------------------------
#1024080 by hswong3i, tstoeckler: Fixed installation profile retrieval.
#995988 by good_man: Wrong default install profile.
#975498 by Gábor Hojtsy: Update JS/CSS-loading to new drupal_add_js/css() API.
#958162 by tsteoeckler, sun: Consistent variable naming.
......
......@@ -56,19 +56,9 @@ function libraries_get_path($name, $base_path = FALSE) {
* @ingroup libraries
*/
function libraries_get_libraries() {
global $profile;
// When this function is called during Drupal's initial installation process,
// the name of the profile that is about to be installed is stored in the
// global $profile variable. At all other times, the regular system variable
// contains the name of the current profile, and we can call variable_get()
// to determine the profile.
if (!isset($profile)) {
$profile = variable_get('install_profile', 'standard');
}
$directory = 'libraries';
$searchdir = array();
$profile = drupal_get_profile();
$config = conf_path();
// Similar to 'modules' and 'themes' directories in the root directory,
......@@ -127,10 +117,7 @@ function libraries_get_libraries() {
* the files.
*/
function libraries_scan_info_files() {
global $profile;
if (!isset($profile)) {
$profile = variable_get('install_profile', 'standard');
}
$profile = drupal_get_profile();
$config = conf_path();
// Build a list of directories.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment