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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/simpletest/tests/graph.test | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.updater.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/simpletest/tests/graph.test b/modules/simpletest/tests/graph.test index c8c99edd6..70af3ff1e 100644 --- a/modules/simpletest/tests/graph.test +++ b/modules/simpletest/tests/graph.test @@ -23,7 +23,7 @@ class GraphUnitTest extends DrupalUnitTestCase { */ function testDepthFirstSearch() { // Provoke the inclusion of graph.inc. - require_once 'includes/graph.inc'; + require_once DRUPAL_ROOT . '/includes/graph.inc'; // The sample graph used is: // 1 --> 2 --> 3 5 ---> 6 diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 6d9fb5767..31148f7eb 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1330,7 +1330,7 @@ function system_modules_uninstall_confirm_form($storage) { // Construct the hidden form elements and list items. foreach (array_filter($storage['uninstall']) as $module => $value) { - $info = drupal_parse_info_file(dirname(drupal_get_filename('module', $module)) . '/' . $module . '.info'); + $info = drupal_parse_info_file(drupal_get_path('module', $module) . '/' . $module . '.info'); $uninstall[] = $info['name']; $form['uninstall'][$module] = array('#type' => 'hidden', '#value' => 1, diff --git a/modules/system/system.updater.inc b/modules/system/system.updater.inc index 079fb0af1..60518d17e 100644 --- a/modules/system/system.updater.inc +++ b/modules/system/system.updater.inc @@ -53,8 +53,8 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface { * Return available database schema updates one a new version is installed. */ public function getSchemaUpdates() { - require_once './includes/install.inc'; - require_once './includes/update.inc'; + require_once DRUPAL_ROOT . '/includes/install.inc'; + require_once DRUPAL_ROOT . '/includes/update.inc'; if (_update_get_project_type($project) != 'module') { return array(); |