Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/26/head
Angie Byron 2009-12-06 18:27:23 +00:00
parent d57f7baa95
commit 614a4dea23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/common.inc
View File

@ -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';

2
includes/theme.maintenance.inc
View File

@ -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';

2
install.php
View File

@ -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';

2
modules/node/node.module
View File

@ -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);