From 614a4dea23f15199731e71c87f07e78808ed9a08 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 6 Dec 2009 18:27:23 +0000 Subject: #320132 by kbahey, catch: Make path.inc swappable. --- includes/common.inc | 2 +- includes/theme.maintenance.inc | 2 +- install.php | 2 +- modules/node/node.module | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/common.inc b/includes/common.inc index 050e8e77f..876e3ae3f 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -4491,7 +4491,7 @@ function _drupal_bootstrap_full() { return; } $called = 1; - require_once DRUPAL_ROOT . '/includes/path.inc'; + 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 . '/includes/menu.inc'; diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 1698630b5..1e61ed071 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -22,7 +22,7 @@ function _drupal_maintenance_theme() { return; } - require_once DRUPAL_ROOT . '/includes/path.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); require_once DRUPAL_ROOT . '/includes/theme.inc'; require_once DRUPAL_ROOT . '/includes/common.inc'; require_once DRUPAL_ROOT . '/includes/unicode.inc'; diff --git a/install.php b/install.php index 4ee60902d..3cdea3375 100644 --- a/install.php +++ b/install.php @@ -240,7 +240,7 @@ function install_begin_request(&$install_state) { require_once DRUPAL_ROOT . '/modules/system/system.install'; require_once DRUPAL_ROOT . '/includes/common.inc'; require_once DRUPAL_ROOT . '/includes/file.inc'; - require_once DRUPAL_ROOT . '/includes/path.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); // Load module basics (needed for hook invokes). include_once DRUPAL_ROOT . '/includes/module.inc'; diff --git a/modules/node/node.module b/modules/node/node.module index 8561fcb11..24c09995d 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1281,7 +1281,7 @@ function node_language_negotiation_info() { * A valid language code on succes, FALSE otherwise. */ function node_language_provider($languages) { - require_once DRUPAL_ROOT . '/includes/path.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); $path = isset($_GET['q']) ? $_GET['q'] : ''; list($language, $path) = language_url_split_prefix($path, $languages); -- cgit v1.2.3