diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-05-18 18:11:13 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-05-18 18:11:13 +0000 |
| commit | d4200e260003dc1e75cd27db8f1b286fa6a30931 (patch) | |
| tree | 26fc792a37f4f98f43167c5fed40f079f012bdab /includes | |
| parent | 245454bece3e3a460ed1504117a4dd7eb635fd8d (diff) | |
| download | brdo-d4200e260003dc1e75cd27db8f1b286fa6a30931.tar.gz brdo-d4200e260003dc1e75cd27db8f1b286fa6a30931.tar.bz2 | |
- Patch #763850 by c960657: require_once() and drupal_get_path() inconsistencies.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | includes/install.core.inc | 2 | ||||
| -rw-r--r-- | includes/install.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index 452013589..80edabc03 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -4459,7 +4459,7 @@ function _drupal_bootstrap_full() { require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); require_once DRUPAL_ROOT . '/includes/theme.inc'; require_once DRUPAL_ROOT . '/includes/pager.inc'; - require_once DRUPAL_ROOT . '/' . variable_get('menu_inc', '/includes/menu.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('menu_inc', 'includes/menu.inc'); require_once DRUPAL_ROOT . '/includes/tablesort.inc'; require_once DRUPAL_ROOT . '/includes/file.inc'; require_once DRUPAL_ROOT . '/includes/unicode.inc'; diff --git a/includes/install.core.inc b/includes/install.core.inc index 6f6ab3b28..dd376ae9c 100644 --- a/includes/install.core.inc +++ b/includes/install.core.inc @@ -1082,7 +1082,7 @@ function _install_select_profile($profiles) { if (sizeof($profiles) == 1) { $profile = array_pop($profiles); // TODO: is this right? - require_once $profile->uri; + require_once DRUPAL_ROOT . '/' . $profile->uri; return $profile->name; } else { diff --git a/includes/install.inc b/includes/install.inc index 1d3595547..c5083eb0a 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -547,7 +547,7 @@ function drupal_verify_profile($install_state) { * functions can be made available while other modules are installed. */ function drupal_install_system() { - $system_path = dirname(drupal_get_filename('module', 'system', NULL)); + $system_path = drupal_get_path('module', 'system'); require_once DRUPAL_ROOT . '/' . $system_path . '/system.install'; module_invoke('system', 'install'); |