Commit 0acde173 authored by alexpott's avatar alexpott

Issue #1949204 by moshe weitzman | RobLoach: Remove path_inc and menu_inc Settings.

parent 1c2e4c51
......@@ -296,7 +296,7 @@ function install_begin_request(&$install_state) {
require_once __DIR__ . '/file.inc';
require_once __DIR__ . '/install.inc';
require_once __DIR__ . '/schema.inc';
require_once __DIR__ . '/../../' . Settings::get('path_inc', 'core/includes/path.inc');
require_once __DIR__ . '/path.inc';
require_once __DIR__ . '/database.inc';
require_once __DIR__ . '/form.inc';
require_once __DIR__ . '/batch.inc';
......
......@@ -23,7 +23,7 @@ function _drupal_maintenance_theme() {
return;
}
require_once DRUPAL_ROOT . '/' . Settings::get('path_inc', 'core/includes/path.inc');
require_once __DIR__ . '/path.inc';
require_once __DIR__ . '/theme.inc';
require_once __DIR__ . '/common.inc';
require_once __DIR__ . '/unicode.inc';
......
......@@ -362,11 +362,11 @@ public function boot() {
// Load legacy and other functional code.
require_once DRUPAL_ROOT . '/core/includes/common.inc';
require_once DRUPAL_ROOT . '/core/includes/database.inc';
require_once DRUPAL_ROOT . '/' . Settings::get('path_inc', 'core/includes/path.inc');
require_once DRUPAL_ROOT . '/core/includes/path.inc';
require_once DRUPAL_ROOT . '/core/includes/module.inc';
require_once DRUPAL_ROOT . '/core/includes/theme.inc';
require_once DRUPAL_ROOT . '/core/includes/pager.inc';
require_once DRUPAL_ROOT . '/' . Settings::get('menu_inc', 'core/includes/menu.inc');
require_once DRUPAL_ROOT . '/core/includes/menu.inc';
require_once DRUPAL_ROOT . '/core/includes/tablesort.inc';
require_once DRUPAL_ROOT . '/core/includes/file.inc';
require_once DRUPAL_ROOT . '/core/includes/unicode.inc';
......
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