- Patch #763850 by c960657: require_once() and drupal_get_path() inconsistencies.

7 files changed, 8 insertions, 8 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');
 
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();
diff --git a/update.php b/update.php
index bd31d1eab..a9bc48b8d 100644
--- a/update.php
+++ b/update.php
@@ -268,7 +268,7 @@ function update_access_allowed() {
   // Calls to user_access() might fail during the Drupal 6 to 7 update process,
   // so we fall back on requiring that the user be logged in as user #1.
   try {
-    require_once drupal_get_path('module', 'user') . '/user.module';
+    require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'user') . '/user.module';
     return user_access('administer software updates');
   }
   catch (Exception $e) {