summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngie Byron2009-12-06 18:27:23 (GMT)
committerAngie Byron2009-12-06 18:27:23 (GMT)
commit614a4dea23f15199731e71c87f07e78808ed9a08 (patch)
treee7f3c1cd6e58f3bfaf55ae5b5fffad9e2065e888
parentd57f7baa958b58220fd97aa91b860767a7a076f3 (diff)
#320132 by kbahey, catch: Make path.inc swappable.
-rw-r--r--includes/common.inc2
-rw-r--r--includes/theme.maintenance.inc2
-rw-r--r--install.php2
-rw-r--r--modules/node/node.module2
4 files changed, 4 insertions, 4 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 050e8e7..876e3ae 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 1698630..1e61ed0 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 4ee6090..3cdea33 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 8561fcb..24c0999 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);