Commit 614a4dea authored by webchick's avatar webchick

#320132 by kbahey, catch: Make path.inc swappable.

parent d57f7baa
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment