summaryrefslogtreecommitdiff
path: root/includes/module.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2008-09-20 20:22:25 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2008-09-20 20:22:25 +0000
commita3bb66e4e81817737ce02ce8f3d0cff5c32fdae9 (patch)
treee31979e262ad7731f7355c494ac722d474e74080 /includes/module.inc
parent9c2e5a52c9762dacb97789226c2ee4065d1e18e9 (diff)
downloadbrdo-a3bb66e4e81817737ce02ce8f3d0cff5c32fdae9.tar.gz
brdo-a3bb66e4e81817737ce02ce8f3d0cff5c32fdae9.tar.bz2
#259623 by dopry and Damien Tournoud: Convert includes/requires to use absolute paths.
Diffstat (limited to 'includes/module.inc')
-rw-r--r--includes/module.inc17
1 files changed, 7 insertions, 10 deletions
diff --git a/includes/module.inc b/includes/module.inc
index 2a131d81f..779d647f7 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -220,7 +220,7 @@ function module_exists($module) {
*/
function module_load_install($module) {
// Make sure the installation API is available
- include_once './includes/install.inc';
+ include_once DRUPAL_ROOT . '/includes/install.inc';
module_load_include('install', $module);
}
@@ -241,16 +241,13 @@ function module_load_include($type, $module, $name = NULL) {
}
if (drupal_function_exists('drupal_get_path')) {
- $file = './' . drupal_get_path('module', $module) . "/$name.$type";
- }
-
- if (is_file($file)) {
- require_once $file;
- return $file;
- }
- else {
- return FALSE;
+ $file = DRUPAL_ROOT . '/' . drupal_get_path('module', $module) . "/$name.$type";
+ if (is_file($file)) {
+ require_once $file;
+ return $file;
+ }
}
+ return FALSE;
}
/**